Changeset b3e8629 in sasview for src/sas/qtgui/Perspectives/Invariant

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

Location:

src/sas/qtgui/Perspectives/Invariant

Files:

• InvariantDetails.py (modified) (1 diff, 1 prop)
• InvariantPerspective.py (modified) (3 diffs, 1 prop)
• InvariantUtils.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py

@@ -5 +5 @@
 
 # local
-from UI.InvariantDetailsUI import Ui_Dialog
-from InvariantUtils import WIDGETS
+from .UI.InvariantDetailsUI import Ui_Dialog
+from .InvariantUtils import WIDGETS
 
 class DetailsDialog(QtGui.QDialog, Ui_Dialog):

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -15 +15 @@
 
 # local
-from UI.TabbedInvariantUI import Ui_tabbedInvariantUI
-from InvariantDetails import DetailsDialog
-from InvariantUtils import WIDGETS
+from .UI.TabbedInvariantUI import Ui_tabbedInvariantUI
+from .InvariantDetails import DetailsDialog
+from .InvariantUtils import WIDGETS
 
 # The minimum q-value to be used when extrapolating
@@ -551 +551 @@
         if not isinstance(data_item, list):
             msg = "Incorrect type passed to the Invariant Perspective"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         if not isinstance(data_item[0], QtGui.QStandardItem):
             msg = "Incorrect type passed to the Invariant Perspective"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         self._model_item = data_item[0]
@@ -631 +631 @@
                     self.calculateInvariant()
                 except:
-                    msg = "Invariant Set_data: " + str(sys.exc_value)
+                    msg = "Invariant Set_data: " + str(sys.exc_info()[1])
                     #wx.PostEvent(self.parent, StatusEvent(status=msg, info="error"))
         else:

src/sas/qtgui/Perspectives/Invariant/InvariantUtils.py

@@ -1 +1 @@
 def enum(*sequential, **named):
-    enums = dict(zip(sequential, range(len(sequential))), **named)
+    enums = dict(list(zip(sequential, list(range(len(sequential))))), **named)
     return type('Enum', (), enums)