Changeset b0b09b9 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 26, 2017 3:13:05 AM (7 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:

895e7359

Parents:

def64a0

Message:

Initial changes to make SasView? run with python3

Location:

src/sas/qtgui/Perspectives

Files:

• Fitting/FitThread.py (modified) (4 diffs)
• Fitting/FittingLogic.py (modified) (2 diffs)
• Fitting/FittingOptions.py (modified) (5 diffs)
• Fitting/FittingPerspective.py (modified) (7 diffs, 1 prop)
• Fitting/FittingUtilities.py (modified) (7 diffs, 1 prop)
• Fitting/FittingWidget.py (modified) (31 diffs, 1 prop)
• Fitting/ModelThread.py (modified) (1 diff)
• Fitting/ModelUtilities.py (modified) (10 diffs)
• Fitting/OptionsWidget.py (modified) (1 diff)
• Fitting/SmearingWidget.py (modified) (1 diff, 1 prop)
• Invariant/InvariantDetails.py (modified) (1 diff, 1 prop)
• Invariant/InvariantPerspective.py (modified) (3 diffs, 1 prop)
• Invariant/InvariantUtils.py (modified) (1 diff)
• __init__.py (modified) (1 diff, 1 prop)

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

@@ -14 +14 @@
 
 def map_apply(arguments):
-    return apply(arguments[0], arguments[1:])
+    return arguments[0](*arguments[1:])
 
 class FitThread(CalcThread):
@@ -55 +55 @@
         except KeyboardInterrupt:
             msg = "Fitting: terminated by the user."
-            raise KeyboardInterrupt, msg
+            raise KeyboardInterrupt(msg)
 
     def compute(self):
@@ -71 +71 @@
             list_q = [None]*fitter_size
 
-            inputs = zip(list_map_get_attr, self.fitter, list_fit_function,
+            inputs = list(zip(list_map_get_attr, self.fitter, list_fit_function,
                          list_q, list_q, list_handler, list_curr_thread,
-                         list_reset_flag)
-            result = map(map_apply, inputs)
+                         list_reset_flag))
+            result = list(map(map_apply, inputs))
             results = (result, time.time()-self.starttime)
             if self.handler:
@@ -81 +81 @@
                 return (results)
 
-        except KeyboardInterrupt, msg:
+        except KeyboardInterrupt as msg:
             # Thread was interrupted, just proceed and re-raise.
             # Real code should not print, but this is an example...

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

@@ -196 +196 @@
                 msg = "Unable to find min/max/length of \n data named %s" % \
                             self.data.filename
-                raise ValueError, msg
+                raise ValueError(msg)
 
         else:
@@ -206 +206 @@
                 msg = "Unable to find min/max of \n data named %s" % \
                             self.data.filename
-                raise ValueError, msg
+                raise ValueError(msg)
             qmax = np.sqrt(x * x + y * y)
             npts = len(data.data)

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

@@ -80 +80 @@
         Use options.FIT_FIELDS to assert which line edit gets what validator
         """
-        for option in bumps.options.FIT_FIELDS.iterkeys():
+        for option in bumps.options.FIT_FIELDS.keys():
             (f_name, f_type) = bumps.options.FIT_FIELDS[option]
             validator = None
@@ -86 +86 @@
                 validator = QtGui.QIntValidator()
                 validator.setBottom(0)
-            elif f_type == types.FloatType:
+            elif f_type == float:
                 validator = QtGui.QDoubleValidator()
                 validator.setBottom(0)
@@ -153 +153 @@
 
         # Update the BUMPS singleton
-        [bumpsUpdate(o) for o in self.config.values[self.current_fitter_id].iterkeys()]
+        [bumpsUpdate(o) for o in self.config.values[self.current_fitter_id].keys()]
 
     def onHelp(self):
@@ -175 +175 @@
         if current_fitter is None:
             current_fitter = self.current_fitter_id
-        if option_id not in bumps.options.FIT_FIELDS.keys(): return None
+        if option_id not in list(bumps.options.FIT_FIELDS.keys()): return None
         option = option_id + '_' + current_fitter
         if not hasattr(self, option): return None
@@ -193 +193 @@
         """
         options = self.config.values[fitter_id]
-        for option in options.iterkeys():
+        for option in options.keys():
             # Find the widget name of the option
             # e.g. 'samples' for 'dream' is 'self.samples_dream'

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

@@ -11 +11 @@
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
 from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
-from sas.qtgui.Perspectives.Fitting import ModelUtilities
+#from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
 class FittingWindow(QtGui.QTabWidget):
@@ -61 +61 @@
         self.fit_options_widget.fit_option_changed.connect(self.onFittingOptionsChange)
 
-        self.menu_manager = ModelUtilities.ModelManager()
-        # TODO: reuse these in FittingWidget properly
-        self.model_list_box = self.menu_manager.get_model_list()
-        self.model_dictionary = self.menu_manager.get_model_dictionary()
+        #self.menu_manager = ModelUtilities.ModelManager()
+        ## TODO: reuse these in FittingWidget properly
+        #self.model_list_box = self.menu_manager.get_model_list()
+        #self.model_dictionary = self.menu_manager.get_model_dictionary()
 
         #self.setWindowTitle('Fit panel - Active Fitting Optimizer: %s' % self.optimizer)
@@ -120 +120 @@
         Create a list if none exists and append if there's already a list
         """
-        if item_key in self.dataToFitTab.keys():
-            self.dataToFitTab[item_key].append(tab_name)
+        item_key_str = str(item_key)
+        if item_key_str in list(self.dataToFitTab.keys()):
+            self.dataToFitTab[item_key_str].append(tab_name)
         else:
-            self.dataToFitTab[item_key] = [tab_name]
+            self.dataToFitTab[item_key_str] = [tab_name]
 
         #print "CURRENT dict: ", self.dataToFitTab
@@ -169 +170 @@
         Given name of the fitting tab - close it
         """
-        for tab_index in xrange(len(self.tabs)):
+        for tab_index in range(len(self.tabs)):
             if self.tabText(tab_index) == tab_name:
                 self.tabCloses(tab_index)
@@ -181 +182 @@
             return
         for index_to_delete in index_list:
-            if index_to_delete in self.dataToFitTab.keys():
-                for tab_name in self.dataToFitTab[index_to_delete]:
+            index_to_delete_str = str(index_to_delete)
+            if index_to_delete_str in list(self.dataToFitTab.keys()):
+                for tab_name in self.dataToFitTab[index_to_delete_str]:
                     # delete tab #index after corresponding data got removed
                     self.closeTabByName(tab_name)
-                self.dataToFitTab.pop(index_to_delete)
+                self.dataToFitTab.pop(index_to_delete_str)
 
         #print "CURRENT dict: ", self.dataToFitTab
@@ -205 +207 @@
         if not isinstance(data_item, list):
             msg = "Incorrect type passed to the Fitting Perspective"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         if not isinstance(data_item[0], QtGui.QStandardItem):
             msg = "Incorrect type passed to the Fitting Perspective"
-            raise AttributeError, msg
+            raise AttributeError(msg)
 
         items = [data_item] if is_batch else data_item
@@ -216 +218 @@
             # Find the first unassigned tab.
             # If none, open a new tab.
-            available_tabs = list(map(lambda tab: tab.acceptsData(), self.tabs))
+            available_tabs = list([tab.acceptsData() for tab in self.tabs])
 
             if numpy.any(available_tabs):

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

@@ -44 +44 @@
     Returns a list of all multi-shell parameters in 'model'
     """
-    return list(filter(lambda par: "[" in par.name, model.iq_parameters))
+    return list([par for par in model.iq_parameters if "[" in par.name])
 
 def getMultiplicity(model):
@@ -156 +156 @@
     """
     for i, item in enumerate(model_header_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        #model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     model.header_tooltips = model_header_tooltips
@@ -167 +168 @@
     model_header_error_captions.insert(2, header_error_caption)
     for i, item in enumerate(model_header_error_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     model_header_error_tooltips = model_header_tooltips
@@ -178 +179 @@
     """
     for i, item in enumerate(poly_header_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     model.header_tooltips = poly_header_tooltips
@@ -190 +191 @@
     poly_header_error_captions.insert(2, header_error_caption)
     for i, item in enumerate(poly_header_error_captions):
-        model.setHeaderData(i, QtCore.Qt.Horizontal, QtCore.QVariant(item))
+        model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
     poly_header_error_tooltips = poly_header_tooltips
@@ -202 +203 @@
     multishell_parameters = getIterParams(parameters)
 
-    for i in xrange(index):
+    for i in range(index):
         for par in multishell_parameters:
             # Create the name: <param>[<i>], e.g. "sld1" for parameter "sld[n]"
@@ -396 +397 @@
 
 def binary_encode(i, digits):
-    return [i >> d & 1 for d in xrange(digits)]
+    return [i >> d & 1 for d in range(digits)]
 
 def getWeight(data, is2d, flag=None):

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

@@ -2 +2 @@
 import os
 from collections import defaultdict
-from itertools import izip
+
 
 import logging
@@ -69 +69 @@
         if role == QtCore.Qt.ToolTipRole:
             if orientation == QtCore.Qt.Horizontal:
-                return QtCore.QString(str(self.header_tooltips[section]))
+                return str(self.header_tooltips[section])
 
         return QtGui.QStandardItemModel.headerData(self, section, orientation, role)
@@ -353 +353 @@
         # Similarly on other tabs
         self.options_widget.setEnablementOnDataLoad()
-
+        self.onSelectModel()
         # Smearing tab
         self.smearing_widget.updateSmearing(self.data)
@@ -473 +473 @@
         model = str(self.cbModel.currentText())
 
+        # empty combobox forced to be read
+        if not model:
+            return
         # Reset structure factor
         self.cbStructureFactor.setCurrentIndex(0)
@@ -763 +766 @@
         """
         """
-        print "UPDATE FIT"
+        print("UPDATE FIT")
         pass
 
@@ -769 +772 @@
         """
         """
-        print "FIT FAILED: ", reason
+        print("FIT FAILED: ", reason)
         pass
 
@@ -814 +817 @@
         param_values = res.pvec     # array([ 0.36221662,  0.0146783 ])
         param_stderr = res.stderr   # array([ 1.71293015,  1.71294233])
-        params_and_errors = zip(param_values, param_stderr)
-        param_dict = dict(izip(param_list, params_and_errors))
+        params_and_errors = list(zip(param_values, param_stderr))
+        param_dict = dict(zip(param_list, params_and_errors))
 
         # Dictionary of fitted parameter: value, error
@@ -836 +839 @@
         Take func and throw it inside the model row loop
         """
-        for row_i in xrange(self._model_model.rowCount()):
+        for row_i in range(self._model_model.rowCount()):
             func(row_i)
 
@@ -851 +854 @@
             # internal so can use closure for param_dict
             param_name = str(self._model_model.item(row, 0).text())
-            if param_name not in param_dict.keys():
+            if param_name not in list(param_dict.keys()):
                 return
             # modify the param value
@@ -863 +866 @@
             # Utility function for updateof polydispersity part of the main model
             param_name = str(self._model_model.item(row, 0).text())+'.width'
-            if param_name not in param_dict.keys():
+            if param_name not in list(param_dict.keys()):
                 return
             # modify the param value
@@ -878 +881 @@
                 return str(self._model_model.item(row, 0).text())
 
-            [createItem(param_name) for param_name in param_dict.keys() if curr_param() == param_name]
+            [createItem(param_name) for param_name in list(param_dict.keys()) if curr_param() == param_name]
 
             error_column.append(item)
@@ -922 +925 @@
             Take func and throw it inside the poly model row loop
             """
-            for row_i in xrange(self._poly_model.rowCount()):
+            for row_i in range(self._poly_model.rowCount()):
                 func(row_i)
 
@@ -931 +934 @@
                 return
             param_name = str(self._poly_model.item(row_i, 0).text()).rsplit()[-1] + '.width'
-            if param_name not in param_dict.keys():
+            if param_name not in list(param_dict.keys()):
                 return
             # modify the param value
@@ -954 +957 @@
                 return str(self._poly_model.item(row_i, 0).text()).rsplit()[-1] + '.width'
 
-            [createItem(param_name) for param_name in param_dict.keys() if poly_param() == param_name]
+            [createItem(param_name) for param_name in list(param_dict.keys()) if poly_param() == param_name]
 
             error_column.append(item)
@@ -991 +994 @@
             Take func and throw it inside the magnet model row loop
             """
-            for row_i in xrange(self._model_model.rowCount()):
+            for row_i in range(self._model_model.rowCount()):
                 func(row_i)
 
@@ -998 +1001 @@
             # internal so can use closure for param_dict
             param_name = str(self._magnet_model.item(row, 0).text())
-            if param_name not in param_dict.keys():
+            if param_name not in list(param_dict.keys()):
                 return
             # modify the param value
@@ -1016 +1019 @@
                 return str(self._magnet_model.item(row, 0).text())
 
-            [createItem(param_name) for param_name in param_dict.keys() if curr_param() == param_name]
+            [createItem(param_name) for param_name in list(param_dict.keys()) if curr_param() == param_name]
 
             error_column.append(item)
@@ -1291 +1294 @@
             # Unparsable field
             return
-        parameter_name = str(self._model_model.data(name_index).toPyObject()) # sld, background etc.
+        parameter_name = str(self._model_model.data(name_index)) #.toPyObject()) # sld, background etc.
 
         # Update the parameter value - note: this supports +/-inf as well
@@ -1357 +1360 @@
 
         return [str(model.item(row_index, 0).text())
-                for row_index in xrange(model.rowCount())
+                for row_index in range(model.rowCount())
                 if isChecked(row_index)]
 
@@ -1398 +1401 @@
             fitted_data.symbol = 'Line'
         # Notify the GUI manager so it can update the main model in DataExplorer
-        GuiUtils.updateModelItemWithPlot(self._index, QtCore.QVariant(fitted_data), name)
+        GuiUtils.updateModelItemWithPlot(self._index, fitted_data, name)
 
     def createTheoryIndex(self, fitted_data):
@@ -1406 +1409 @@
         name = self.nameFromData(fitted_data)
         # Notify the GUI manager so it can create the theory model in DataExplorer
-        new_item = GuiUtils.createModelItemWithPlot(QtCore.QVariant(fitted_data), name=name)
+        new_item = GuiUtils.createModelItemWithPlot(fitted_data, name=name)
         self.communicate.updateTheoryFromPerspectiveSignal.emit(new_item)
 
@@ -1460 +1463 @@
         Thread returned error
         """
-        print "Calculate Data failed with ", reason
+        print("Calculate Data failed with ", reason)
 
     def complete1D(self, return_data):
@@ -1557 +1560 @@
             else:
                 # Create as many entries as current shells
-                for ishell in xrange(1, self.current_shell_displayed+1):
+                for ishell in range(1, self.current_shell_displayed+1):
                     # Remove [n] and add the shell numeral
                     name = param_name[0:param_name.index('[')] + str(ishell)
@@ -1585 +1588 @@
         # All possible polydisp. functions as strings in combobox
         func = QtGui.QComboBox()
-        func.addItems([str(name_disp) for name_disp in POLYDISPERSITY_MODELS.iterkeys()])
+        func.addItems([str(name_disp) for name_disp in POLYDISPERSITY_MODELS.keys()])
         # Set the default index
         func.setCurrentIndex(func.findText(DEFAULT_POLYDISP_FUNCTION))
@@ -1636 +1639 @@
                 lo = self.lstPoly.itemDelegate().poly_pd
                 hi = self.lstPoly.itemDelegate().poly_function
-                [self._poly_model.item(row_index, i).setEnabled(False) for i in xrange(lo, hi)]
+                [self._poly_model.item(row_index, i).setEnabled(False) for i in range(lo, hi)]
                 return
             except IOError:
@@ -1646 +1649 @@
         self._poly_model.blockSignals(True)
         max_range = self.lstPoly.itemDelegate().poly_filename
-        [self._poly_model.item(row_index, i).setEnabled(True) for i in xrange(7)]
+        [self._poly_model.item(row_index, i).setEnabled(True) for i in range(7)]
         file_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_filename)
-        self._poly_model.setData(file_index, QtCore.QVariant(""))
+        self._poly_model.setData(file_index, "")
         self._poly_model.blockSignals(False)
 
@@ -1657 +1660 @@
         nsigs = POLYDISPERSITY_MODELS[str(combo_string)].default['nsigmas']
 
-        self._poly_model.setData(npts_index, QtCore.QVariant(npts))
-        self._poly_model.setData(nsigs_index, QtCore.QVariant(nsigs))
+        self._poly_model.setData(npts_index, npts)
+        self._poly_model.setData(nsigs_index, nsigs)
 
         self.iterateOverModel(updateFunctionCaption)
@@ -1669 +1672 @@
         datafile = QtGui.QFileDialog.getOpenFileName(
             self, "Choose a weight file", "", "All files (*.*)",
-            None, QtGui.QFileDialog.DontUseNativeDialog)
+            QtGui.QFileDialog.DontUseNativeDialog)
 
         if datafile is None or str(datafile)=='':
@@ -1698 +1701 @@
         fname = os.path.basename(str(datafile))
         fname_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_filename)
-        self._poly_model.setData(fname_index, QtCore.QVariant(fname))
+        self._poly_model.setData(fname_index, fname)
 
     def setMagneticModel(self):
@@ -1720 +1723 @@
         top_index = self.kernel_module.multiplicity_info.number
         shell_names = []
-        for i in xrange(1, top_index+1):
+        for i in range(1, top_index+1):
             for name in multi_names:
                 shell_names.append(name+str(i))
@@ -1770 +1773 @@
         func = QtGui.QComboBox()
         # Available range of shells displayed in the combobox
-        func.addItems([str(i) for i in xrange(param_length+1)])
+        func.addItems([str(i) for i in range(param_length+1)])
 
         # Respond to index change

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

@@ -65 +65 @@
         if self.data is None:
             msg = "Compute Calc2D receive data = %s.\n" % str(self.data)
-            raise ValueError, msg
+            raise ValueError(msg)
 
         # Define matrix where data will be plotted

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)

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

@@ -96 +96 @@
         """
         self.model = QtGui.QStandardItemModel()
-        for model_item in xrange(len(MODEL)):
+        for model_item in range(len(MODEL)):
             self.model.setItem(model_item, QtGui.QStandardItem())
         # Attach slot

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

@@ -65 +65 @@
         """
         self.model = QtGui.QStandardItemModel()
-        for model_item in xrange(len(MODEL)):
+        for model_item in range(len(MODEL)):
             self.model.setItem(model_item, QtGui.QStandardItem())
         # Attach slot

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)
 

src/sas/qtgui/Perspectives/__init__.py

@@ -2 +2 @@
 # When adding a new perspective, this dictionary needs to be updated
 
-from Fitting.FittingPerspective import FittingWindow
-from Invariant.InvariantPerspective import InvariantWindow
+from .Fitting.FittingPerspective import FittingWindow
+from .Invariant.InvariantPerspective import InvariantWindow
 
 PERSPECTIVES = {