Changeset b3e8629 in sasview for src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py

Timestamp:

Nov 9, 2017 6:41:54 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

cee5c78

Parents:

749b715

git-author:

Piotr Rozyczko <rozyczko@…> (10/26/17 01:13:05)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:41:54)

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py (modified) (10 diffs)

src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py

@@ -2 +2 @@
     Utilities to manage models
 """
-from __future__ import print_function
+
 
 import traceback
@@ -68 +68 @@
     except:
         msg = "Plugin %s error in __init__ \n\t: %s %s\n" % (str(name),
-                                                             str(sys.exc_type),
+                                                             str(sys.exc_info()[0]),
                                                              sys.exc_info()[1])
         plugin_log(msg)
@@ -78 +78 @@
         except:
             msg = "Plugin %s: error writing function \n\t :%s %s\n " % \
-                    (str(name), str(sys.exc_type), sys.exc_info()[1])
+                    (str(name), str(sys.exc_info()[0]), sys.exc_info()[1])
             plugin_log(msg)
             return None
@@ -138 +138 @@
     Class to check for problems with specific values
     """
-    def __nonzero__(self):
+    def __bool__(self):
         type, value, tb = sys.exc_info()
         if type is not None and issubclass(type, py_compile.PyCompileError):
             print("Problem with", repr(value))
-            raise type, value, tb
+            raise type(value).with_traceback(tb)
         return 1
 
@@ -211 +211 @@
 
         """
-        if name not in self.mydict.keys():
+        if name not in list(self.mydict.keys()):
             self.reset_list(name, mylist)
 
@@ -292 +292 @@
         #Looking for plugins
         self.stored_plugins = self.findModels()
-        self.plugins = self.stored_plugins.values()
-        for name, plug in self.stored_plugins.iteritems():
+        self.plugins = list(self.stored_plugins.values())
+        for name, plug in self.stored_plugins.items():
             self.model_dictionary[name] = plug
         
@@ -322 +322 @@
         new_plugins = self.findModels()
         if len(new_plugins) > 0:
-            for name, plug in  new_plugins.iteritems():
-                if name not in self.stored_plugins.keys():
+            for name, plug in  new_plugins.items():
+                if name not in list(self.stored_plugins.keys()):
                     self.stored_plugins[name] = plug
                     self.plugins.append(plug)
@@ -338 +338 @@
         self.plugins = []
         new_plugins = _find_models()
-        for name, plug in  new_plugins.iteritems():
-            for stored_name, stored_plug in self.stored_plugins.iteritems():
+        for name, plug in  new_plugins.items():
+            for stored_name, stored_plug in self.stored_plugins.items():
                 if name == stored_name:
                     del self.stored_plugins[name]
@@ -358 +358 @@
 
         """
-        if int(evt.GetId()) in self.form_factor_dict.keys():
+        if int(evt.GetId()) in list(self.form_factor_dict.keys()):
             from sasmodels.sasview_model import MultiplicationModel
             self.model_dictionary[MultiplicationModel.__name__] = MultiplicationModel
@@ -417 +417 @@
     __modelmanager = ModelManagerBase()
     cat_model_list = [__modelmanager.model_dictionary[model_name] for model_name \
-                      in __modelmanager.model_dictionary.keys() \
-                      if model_name not in __modelmanager.stored_plugins.keys()]
+                      in list(__modelmanager.model_dictionary.keys()) \
+                      if model_name not in list(__modelmanager.stored_plugins.keys())]
 
     CategoryInstaller.check_install(model_list=cat_model_list)