Changeset 99ea1b0 in sasview for src

Timestamp:

Oct 27, 2017 8:49:35 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:

0849aec

Parents:

895e7359

Message:

Update for unit tests and minor functionality quirks

Location:

src/sas/qtgui

Files:

• Calculators/DataOperationUtilityPanel.py (modified) (6 diffs)
• Calculators/GenericScatteringCalculator.py (modified) (3 diffs, 1 prop)
• Calculators/ResolutionCalculatorPanel.py (modified) (21 diffs, 1 prop)
• Calculators/SldPanel.py (modified) (1 prop)
• Calculators/SlitSizeCalculator.py (modified) (1 diff, 1 prop)
• Calculators/UnitTesting/DataOperationUtilityTest.py (modified) (1 diff)
• Calculators/UnitTesting/DensityCalculatorTest.py (modified) (1 diff)
• Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (1 diff)
• Calculators/UnitTesting/ResolutionCalculatorPanelTest.py (modified) (1 diff)
• Calculators/UnitTesting/SLDCalculatorTest.py (modified) (1 diff)
• Calculators/UnitTesting/SlitSizeCalculatorTest.py (modified) (1 diff, 1 prop)
• MainWindow/DataExplorer.py (modified) (4 diffs, 1 prop)
• MainWindow/UnitTesting/AboutBoxTest.py (modified) (1 diff)
• MainWindow/UnitTesting/DataExplorerTest.py (modified) (5 diffs, 1 prop)
• MainWindow/UnitTesting/GuiManagerTest.py (modified) (5 diffs, 1 prop)
• MainWindow/UnitTesting/MainWindowTest.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingLogicTest.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingOptionsTest.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (6 diffs, 1 prop)
• Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)
• Plotting/UnitTesting/AddTextTest.py (modified) (1 diff)
• Plotting/UnitTesting/BoxSumTest.py (modified) (1 diff)
• Plotting/UnitTesting/ColorMapTest.py (modified) (1 diff)
• Plotting/UnitTesting/LinearFitTest.py (modified) (6 diffs)
• Plotting/UnitTesting/PlotPropertiesTest.py (modified) (1 diff)
• Plotting/UnitTesting/Plotter2DTest.py (modified) (1 diff)
• Plotting/UnitTesting/PlotterBaseTest.py (modified) (1 diff)
• Plotting/UnitTesting/PlotterTest.py (modified) (4 diffs, 1 prop)
• Plotting/UnitTesting/SlicerModelTest.py (modified) (1 diff)
• Plotting/UnitTesting/SlicerParametersTest.py (modified) (2 diffs)
• UnitTesting/TestUtils.py (modified) (2 diffs, 1 prop)
• UnitTesting/TestUtilsTest.py (modified) (1 diff)
• Utilities/UnitTesting/GuiUtilsTest.py (modified) (1 diff)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -273 +273 @@
                 msg = 'DataOperation: Number requires a float number'
                 logging.warning(msg)
-                self.txtNumber.setStyleSheet(QtCore.QString(BG_RED))
+                self.txtNumber.setStyleSheet(BG_RED)
 
             elif float(self.txtNumber.text()) == 0.:
@@ -279 +279 @@
                 msg = 'DataOperation: Number requires a non zero number'
                 logging.warning(msg)
-                self.txtNumber.setStyleSheet(QtCore.QString(BG_RED))
+                self.txtNumber.setStyleSheet(BG_RED)
 
             else:
-                self.txtNumber.setStyleSheet(QtCore.QString(BG_WHITE))
+                self.txtNumber.setStyleSheet(BG_WHITE)
                 self.data2 = float(self.txtNumber.text())
                 self.updatePlot(self.graphData2, self.layoutData2, self.data2)
@@ -293 +293 @@
         else:
             if self.cbData2.currentText() == 'Number':
-                self.cbData1.setStyleSheet(QtCore.QString(BG_WHITE))
-                self.cbData2.setStyleSheet(QtCore.QString(BG_WHITE))
+                self.cbData1.setStyleSheet(BG_WHITE)
+                self.cbData2.setStyleSheet(BG_WHITE)
                 return True
 
             elif self.data1.__class__.__name__ != self.data2.__class__.__name__:
-                self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
-                self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
+                self.cbData1.setStyleSheet(BG_RED)
+                self.cbData2.setStyleSheet(BG_RED)
                 print(self.data1.__class__.__name__ != self.data2.__class__.__name__)
                 logging.warning('Cannot compute data of different dimensions')
@@ -308 +308 @@
                              not all(i == j for i, j in zip(self.data1.x, self.data2.x))):
                 logging.warning('Cannot compute 1D data of different lengths')
-                self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
-                self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
+                self.cbData1.setStyleSheet(BG_RED)
+                self.cbData2.setStyleSheet(BG_RED)
                 return False
 
@@ -320 +320 @@
                                 zip(self.data1.qy_data, self.data2.qy_data))
                          ):
-                self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
-                self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
+                self.cbData1.setStyleSheet(BG_RED)
+                self.cbData2.setStyleSheet(BG_RED)
                 logging.warning('Cannot compute 2D data of different lengths')
                 return False
 
             else:
-                self.cbData1.setStyleSheet(QtCore.QString(BG_WHITE))
-                self.cbData2.setStyleSheet(QtCore.QString(BG_WHITE))
+                self.cbData1.setStyleSheet(BG_WHITE)
+                self.cbData2.setStyleSheet(BG_WHITE)
                 return True
 
@@ -333 +333 @@
         """ Check that name of output does not already exist """
         name_to_check = str(self.txtOutputData.text())
-        self.txtOutputData.setStyleSheet(QtCore.QString(BG_WHITE))
+        self.txtOutputData.setStyleSheet(BG_WHITE)
 
         if name_to_check is None or name_to_check == '':
-            self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED))
+            self.txtOutputData.setStyleSheet(BG_RED)
             logging.warning('No output name')
             return False
 
         elif name_to_check in self.list_data_items:
-            self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED))
+            self.txtOutputData.setStyleSheet(BG_RED)
             logging.warning('The Output data name already exists')
             return False
 
         else:
-            self.txtOutputData.setStyleSheet(QtCore.QString(BG_WHITE))
+            self.txtOutputData.setStyleSheet(BG_WHITE)
             return True
 

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -235 +235 @@
         """Check range of text edits for QMax and Number of Qbins """
         text_edit = self.sender()
-        text_edit.setStyleSheet(
-            QtCore.QString.fromUtf8('background-color: rgb(255, 255, 255);'))
+        text_edit.setStyleSheet('background-color: rgb(255, 255, 255);')
         if text_edit.text():
             value = float(str(text_edit.text()))
             if text_edit == self.txtQxMax:
                 if value <= 0 or value > 1000:
-                    text_edit.setStyleSheet(QtCore.QString.fromUtf8(
-                        'background-color: rgb(255, 182, 193);'))
+                    text_edit.setStyleSheet('background-color: rgb(255, 182, 193);')
                 else:
-                    text_edit.setStyleSheet(QtCore.QString.fromUtf8(
-                        'background-color: rgb(255, 255, 255);'))
+                    text_edit.setStyleSheet('background-color: rgb(255, 255, 255);')
             elif text_edit == self.txtNoQBins:
                 if value < 2 or value > 1000:
-                    self.txtNoQBins.setStyleSheet(QtCore.QString.fromUtf8(
-                        'background-color: rgb(255, 182, 193);'))
+                    self.txtNoQBins.setStyleSheet('background-color: rgb(255, 182, 193);')
                 else:
-                    self.txtNoQBins.setStyleSheet(QtCore.QString.fromUtf8(
-                        'background-color: rgb(255, 255, 255);'))
+                    self.txtNoQBins.setStyleSheet('background-color: rgb(255, 255, 255);')
 
     def update_gui(self):
@@ -555 +550 @@
             # Add deferred callback for call return
             d.addCallback(self.plot_1_2d)
+            d.addErrback(self.calculateFailed)
         except:
             log_msg = "{}. stop".format(sys.exc_info()[1])
@@ -564 +560 @@
         Copied from previous version
         """
+        pass
+
+    def calculateFailed(self, reason):
+        """
+        """
+        print("Calculate Failed with:\n", reason)
         pass
 

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -111 +111 @@
         # call compute to calculate with default values
         self.createTemplate2DPlot()
-        self.onCompute()
+        #self.onCompute()
 
     # #################################
@@ -123 +123 @@
         text_edit = self.txtWavelength  # self.sender()
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             input_string = str(text_edit.text())
             if self.cbWaveColor.currentText() != 'TOF':
                 input_wavelength = re.match('\d+\.?\d*', input_string)
                 if input_wavelength is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info('Wavelength has to be a number.')
                 else:
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
             else:
@@ -139 +139 @@
 
                 if interval_wavelength is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info("Wavelength's input has to be an interval: "
@@ -149 +149 @@
 
                     if float(wavelength_min) >= float(wavelength_max):
-                        text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                        text_edit.setStyleSheet(BG_RED)
                         self.cmdCompute.setEnabled(False)
                         logging.info("Wavelength: min must be smaller than max.")
 
                     else:
-                        text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                        text_edit.setStyleSheet(BG_WHITE)
                         self.cmdCompute.setEnabled(True)
 
@@ -163 +163 @@
 
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             if self.cbWaveColor.currentText() != 'TOF':
                 pattern = '^\d+\.?\d*(|;\s*\d+)$'
@@ -170 +170 @@
 
                 if wavelength_spread_input is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info('Wavelength spread has to be specified: '
@@ -178 +178 @@
                     split_input = wavelength_spread_input.group().split(';')
                     self.num_wave = split_input[1] if len(split_input) > 1 else 10
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
             else:
@@ -186 +186 @@
 
                 if wavelength_spread_input is None:
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info("Wavelength spread has to be specified: "
@@ -197 +197 @@
                     self.num_wave = split_input[1] if len(
                         split_input) > 1 else 10
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
 
@@ -205 +205 @@
 
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             pattern = '^\d+\.?\d*,\s*\d+\.?\d*$'
             input_string = str(text_edit.text())
@@ -211 +211 @@
 
             if pixels_input is None:
-                text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                text_edit.setStyleSheet(BG_RED)
                 self.cmdCompute.setEnabled(False)
                 logging.info('The input for the detector should contain 2 '
@@ -217 +217 @@
 
             else:
-                text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                text_edit.setStyleSheet(BG_WHITE)
                 self.cmdCompute.setEnabled(True)
 
@@ -229 +229 @@
             q_input = re.match(pattern, input_string)
             if q_input is None:
-                text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                text_edit.setStyleSheet(BG_RED)
                 self.cmdCompute.setEnabled(False)
                 logging.info('Qx and Qy should contain one or more comma-separated numbers.')
             else:
-                text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                text_edit.setStyleSheet(BG_WHITE)
                 self.cmdCompute.setEnabled(True)
                 qx = str(self.txtQx.text()).split(',')
@@ -247 +247 @@
 
                 elif len(qx) != len(qy):
-                    text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                    text_edit.setStyleSheet(BG_RED)
                     self.cmdCompute.setEnabled(False)
                     logging.info(
@@ -253 +253 @@
 
                 else:
-                    text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                    text_edit.setStyleSheet(BG_WHITE)
                     self.cmdCompute.setEnabled(True)
 
@@ -261 +261 @@
 
         if text_edit.isModified():
-            text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+            text_edit.setStyleSheet(BG_WHITE)
             input_string = str(text_edit.text())
             pattern = '^\d+\.?\d*(|,\s*\d+)$'
@@ -267 +267 @@
 
             if aperture_input is None:
-                text_edit.setStyleSheet(QtCore.QString(BG_RED))
+                text_edit.setStyleSheet(BG_RED)
                 self.cmdCompute.setEnabled(False)
                 logging.info('A circular aperture is defined by a single '
@@ -274 +274 @@
 
             else:
-                text_edit.setStyleSheet(QtCore.QString(BG_WHITE))
+                text_edit.setStyleSheet(BG_WHITE)
                 self.cmdCompute.setEnabled(True)
 
@@ -524 +524 @@
 
             cal_res.addCallback(self.complete)
+            cal_res.addErrback(self.calculateFailed)
 
             # logging.info("Computation is in progress...")
@@ -531 +532 @@
             raise
 
+    def calculateFailed(self, reason):
+        print("calculateFailed Failed with:\n", reason)
+        pass
+
     def complete(self, image):
         """
@@ -562 +567 @@
         : return: image (numpy array)
         """
+        # This fails in py3 with
+        # [Failure instance: Traceback: <class 'TypeError'>: 'map' object is not subscriptable
+        # INVESTIGATE
         image = map(func, qx, qy,
                     qx_min, qx_max,

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -82 +82 @@
             return
 
-        if isinstance(path, QtCore.QString):
-            path = str(path)
-
         return path
 

src/sas/qtgui/Calculators/UnitTesting/DataOperationUtilityTest.py

@@ -8 +8 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import Qt
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 from twisted.internet import threads

src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py

@@ -6 +6 @@
 from PyQt4.QtTest import QTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 ####### TEMP

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -7 +7 @@
 
 from PyQt4.QtCore import Qt
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 # set up import paths

src/sas/qtgui/Calculators/UnitTesting/ResolutionCalculatorPanelTest.py

@@ -8 +8 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import Qt
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
 
 from twisted.internet import threads

src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

@@ -6 +6 @@
 from PyQt4.QtTest import QTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 ####### TEMP

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -4 +4 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import Qt
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -175 +175 @@
         load_thread = threads.deferToThread(self.readData, url)
         load_thread.addCallback(self.loadComplete)
+        load_thread.addErrback(self.loadFailed)
 
     def loadFile(self, event=None):
@@ -221 +222 @@
             load_thread = threads.deferToThread(self.readProject, filename)
             load_thread.addCallback(self.readProjectComplete)
+            load_thread.addErrback(self.readProjectFailed)
+
+    def readProjectFailed(self, reason):
+        """
+        """
+        print("readProjectFailed FAILED: ", reason)
+        pass
 
     def readProject(self, filename):
@@ -614 +622 @@
             return
 
-        #if isinstance(paths, QtCore.QStringList):
-        #    paths = [str(f) for f in paths]
-
         if not isinstance(paths, list):
             paths = [paths]
@@ -992 +997 @@
         self.manager.add_data(data_list=output_data)
 
+    def loadErrback(self, reason):
+        print("File Load Failed with:\n", reason)
+        pass
+
     def updateModel(self, data, p_file):
         """

src/sas/qtgui/MainWindow/UnitTesting/AboutBoxTest.py

@@ -6 +6 @@
 from PyQt4.QtTest import QTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -5 +5 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import *
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 from mpl_toolkits.mplot3d import Axes3D
 
@@ -157 +157 @@
 
         expected_list = [0, 0, 33, 66, -1]
-        spied_list = [spy_progress_bar_update.called()[i]['args'][0] for i in xrange(5)]
+        spied_list = [spy_progress_bar_update.called()[i]['args'][0] for i in range(5)]
         self.assertEqual(expected_list, spied_list)
         
@@ -173 +173 @@
         filename = ["cyl_400_20.txt", "cyl_400_20.txt", "P123_D2O_10_percent.dat"]
         self.form.readData(filename)
-
-        self.form.show()
-        app.exec_()
 
         # Assure the model contains three items
@@ -329 +326 @@
         self.form.cbSelect.setCurrentIndex(1)
 
+        self.form.show()
+        app.exec_()
+
         # Test the current selection
         item1D = self.form.model.item(0)
@@ -507 +507 @@
         # We don't know the data ID, so need to iterate over dict
         data_dict = spy_data_received.called()[0]['args'][0]
-        for data_key, data_value in data_dict.iteritems():
+        for data_key, data_value in data_dict.items():
             self.assertIsInstance(data_value, Data1D)
 

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -9 +9 @@
 from PyQt4.QtCore import *
 from PyQt4.QtWebKit import *
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths
@@ -74 +74 @@
         # We are in the MainWindow scope, so simple 'print' will work
         message = "from stdout"
-        print message
+        print(message)
         self.assertIn(message, self.manager.logDockWidget.widget().toPlainText())
 
@@ -162 +162 @@
         """
         # 1. version = 0.0.0
-        version_info = {u'version' : u'0.0.0'}
+        version_info = {'version' : '0.0.0'}
         spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
 
@@ -172 +172 @@
 
         # 2. version < LocalConfig.__version__
-        version_info = {u'version' : u'0.0.1'}
+        version_info = {'version' : '0.0.1'}
         spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
 
@@ -182 +182 @@
 
         # 3. version > LocalConfig.__version__
-        version_info = {u'version' : u'999.0.0'}
+        version_info = {'version' : '999.0.0'}
         spy_status_update = QtSignalSpy(self.manager, self.manager.communicate.statusBarUpdateSignal)
         webbrowser.open = MagicMock()

src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

@@ -5 +5 @@
 from PyQt4 import QtTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

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

@@ -566 +566 @@
         model_row = item.row()
         name_index = self._poly_model.index(model_row, 0)
-        parameter_name = str(name_index.data().toString()).lower() # "distribution of sld" etc.
+        parameter_name = str(name_index.data()).lower() # "distribution of sld" etc.
         if "distribution of" in parameter_name:
             # just the last word

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -3 +3 @@
 
 import numpy
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py

@@ -6 +6 @@
 from PyQt4 import QtWebKit
 
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

@@ -6 +6 @@
 from PyQt4 import QtTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -6 +6 @@
 from PyQt4 import QtTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 from twisted.internet import threads
 
@@ -60 +60 @@
 
         #Test loading from json categories
-        category_list = fittingWindow.master_category_dict.keys()
+        category_list = list(fittingWindow.master_category_dict.keys())
 
         for category in category_list:
@@ -93 +93 @@
         fittingWindow.SASModelToQModel("cylinder")
         pd_index = fittingWindow.lstPoly.model().index(0,0)
-        self.assertEqual(str(pd_index.data().toString()), "Distribution of radius")
+        self.assertEqual(str(pd_index.data()), "Distribution of radius")
         pd_index = fittingWindow.lstPoly.model().index(1,0)
-        self.assertEqual(str(pd_index.data().toString()), "Distribution of length")
+        self.assertEqual(str(pd_index.data()), "Distribution of length")
 
         # test the delegate a bit
         delegate = fittingWindow.lstPoly.itemDelegate()
         self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 5)
-        self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
+        self.assertEqual(delegate.editableParameters(), [1, 2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
         self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
@@ -361 +361 @@
 
         # Test presence of comboboxes in last column
-        for row in xrange(self.widget._poly_model.rowCount()):
+        for row in range(self.widget._poly_model.rowCount()):
             func_index = self.widget._poly_model.index(row, 6)
             self.assertTrue(isinstance(self.widget.lstPoly.indexWidget(func_index), QtGui.QComboBox))
@@ -509 +509 @@
 
         # Test rows
-        for row in xrange(self.widget._magnet_model.rowCount()):
+        for row in range(self.widget._magnet_model.rowCount()):
             func_index = self.widget._magnet_model.index(row, 0)
             self.assertIn(':', self.widget._magnet_model.item(row, 0).text())
@@ -889 +889 @@
 
         # check that range of variation for this parameter has NOT been changed
-        print self.widget.kernel_module.details[name_modified_param]
+        print(self.widget.kernel_module.details[name_modified_param])
         self.assertNotIn(new_value, self.widget.kernel_module.details[name_modified_param] )
 

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

@@ -180 +180 @@
             # Add deferred callback for call return
             d.addCallback(self.plotResult)
+            d.addErrback(self.plotFailed)
         except Exception as ex:
             # Set the button back to available
@@ -186 +187 @@
             self.pushButton.setStyleSheet(self.style)
 
+    def plotFailed(self, reason):
+        """
+        """
+        print("plotFailed FAILED: ", reason)
+        pass
 
     def plotResult(self, model):

src/sas/qtgui/Plotting/UnitTesting/AddTextTest.py

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

src/sas/qtgui/Plotting/UnitTesting/BoxSumTest.py

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py

@@ -4 +4 @@
 
 from PyQt4 import QtGui
-from mock import MagicMock
+from unittest.mock import MagicMock
 import matplotlib as mpl
 

src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

@@ -4 +4 @@
 
 from PyQt4 import QtGui
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths
@@ -59 +59 @@
         return_values = self.widget.parent.emit.call_args[0][1]
         # Compare
-        self.assertItemsEqual(return_values[0], [1.0, 3.0])
+        self.assertCountEqual(return_values[0], [1.0, 3.0])
         self.assertAlmostEqual(return_values[1][0], 10.004054329, 6)
         self.assertAlmostEqual(return_values[1][1], 12.030439848, 6)
@@ -68 +68 @@
         return_values = self.widget.parent.emit.call_args[0][1]
         # Compare
-        self.assertItemsEqual(return_values[0], [1.0, 3.0])
+        self.assertCountEqual(return_values[0], [1.0, 3.0])
         self.assertAlmostEqual(return_values[1][0], 9.987732937, 6)
         self.assertAlmostEqual(return_values[1][1], 11.84365082, 6)
@@ -81 +81 @@
         x, y, dy = self.widget.origData()
 
-        self.assertItemsEqual(x, orig_x)
+        self.assertCountEqual(x, orig_x)
         self.assertEqual(y[0], orig_y[0])
         self.assertAlmostEqual(y[1], orig_y[1], 8)
@@ -98 +98 @@
         x, y, dy = self.widget.origData()
 
-        self.assertItemsEqual(x, orig_x)
-        self.assertItemsEqual(y, orig_y)
-        self.assertItemsEqual(dy, orig_dy)
+        self.assertCountEqual(x, orig_x)
+        self.assertCountEqual(y, orig_y)
+        self.assertCountEqual(dy, orig_dy)
 
         # x, log(y)
@@ -111 +111 @@
         x, y, dy = self.widget.origData()
 
-        self.assertItemsEqual(x, orig_x)
+        self.assertCountEqual(x, orig_x)
         self.assertEqual(y[0], orig_y[0])
         self.assertAlmostEqual(y[1], orig_y[1], 8)

src/sas/qtgui/Plotting/UnitTesting/PlotPropertiesTest.py

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

@@ -7 +7 @@
 from PyQt4 import QtCore
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
-from mock import MagicMock
+from unittest.mock import MagicMock
 from mpl_toolkits.mplot3d import Axes3D
 

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -2 +2 @@
 import unittest
 import platform
-from mock import patch, MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -6 +6 @@
 from PyQt4 import QtCore
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 ####### TEMP
@@ -236 +236 @@
 
         # Just this one plot
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 1)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 1)
         self.plotter.onLinearFit(1)
 
@@ -260 +260 @@
 
         # Assure we have two sets
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 2)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 2)
 
         # Delete one set
         self.plotter.onRemovePlot(2)
         # Assure we have two sets
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 1)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 1)
 
         self.plotter.manager = MagicMock()
@@ -272 +272 @@
         self.plotter.onRemovePlot(1)
         # Assure we have no plots
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 0)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 0)
         # Assure the plotter window is closed
         self.assertFalse(self.plotter.isVisible())

src/sas/qtgui/Plotting/UnitTesting/SlicerModelTest.py

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

src/sas/qtgui/Plotting/UnitTesting/SlicerParametersTest.py

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui
@@ -7 +7 @@
 from PyQt4 import QtTest
 from PyQt4 import QtWebKit
-
-from mock import MagicMock
 
 # set up import paths

src/sas/qtgui/UnitTesting/TestUtils.py

@@ -10 +10 @@
     """
     if method_name is not None:
-        print("\nWARNING: %s needs implementing!"%method_name)
+        print(("\nWARNING: %s needs implementing!"%method_name))
     else:
         (frame, filename, line_number,
             function_name, lines, index) = inspect.getouterframes(inspect.currentframe())[1]
-        print("\nWARNING: %s needs implementing!"%function_name)
+        print(("\nWARNING: %s needs implementing!"%function_name))
 
 class QtSignalSpy(QObject):
@@ -39 +39 @@
         except AttributeError:
             msg = "Wrong construction of QtSignalSpy instance"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def slot(self, *args, **kwargs):

src/sas/qtgui/UnitTesting/TestUtilsTest.py

@@ -5 +5 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import *
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # Local

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ -5 +5 @@
 from PyQt4 import QtCore
 from PyQt4 import QtGui
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths