Merge branch 'release_6.0.0' into 2369-multiplicity-copy

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -116,7 +116,7 @@ def calculateSlitSize(self, data=None):
         try:
             xdata = data.x
             ydata = data.y
-            if xdata.size == 0 or xdata is None or ydata.size == 0 or ydata is None:
+            if xdata is None or len(xdata) == 0 or ydata is None or len(ydata) == 0:
                 msg = "The current data is empty please check x and y"
                 logging.error(msg)
                 return

src/sas/qtgui/Plotting/Plotter.py

@@ -394,7 +394,7 @@ def addPlotsToContextMenu(self):
 
             if plot.is_data:
                 self.actionHideError = plot_menu.addAction("Hide Error Bar")
-                if plot.dy is not None and plot.dy != []:
+                if plot.dy is not None and len(plot.dy)>0:
                     if plot.hide_error:
                         self.actionHideError.setText('Show Error Bar')
                 else:

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

@@ -49,7 +49,7 @@ def testDefaults(self, plotter):
         assert isinstance(plotter.canvas, FigureCanvas)
         assert isinstance(plotter.properties, ScaleProperties)
 
-        assert plotter._data == []
+        assert len(plotter._data) == 0
         assert plotter._xscale == 'log'
         assert plotter._yscale == 'log'
         assert plotter.scale == 'linear'