Changeset 235f514 in sasview for src/sas/sasgui/plottools/plottables.py

Timestamp:

Apr 9, 2017 3:46:10 AM (7 years ago)

Author:

andyfaff

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ac07a3a

Parents:

5b2b04d

Message:

MAINT: replace '== None' by 'is None'

File:

• src/sas/sasgui/plottools/plottables.py (modified) (8 diffs)

src/sas/sasgui/plottools/plottables.py

@@ -229 +229 @@
             if p.hidden == True:
                 continue
-            if not p.x == None:
+            if not p.x is None:
                 for x_i in p.x:
-                    if min_value == None or x_i < min_value:
+                    if min_value is None or x_i < min_value:
                         min_value = x_i
-                    if max_value == None or x_i > max_value:
+                    if max_value is None or x_i > max_value:
                         max_value = x_i
         return min_value, max_value
@@ -562 +562 @@
         Returns True if there is no data stored in the plottable
         """
-        if not self.x == None and len(self.x) == 0 \
-            and not self.y == None and len(self.y) == 0:
+        if not self.x is None and len(self.x) == 0 \
+            and not self.y is None and len(self.y) == 0:
             return True
         return False
@@ -679 +679 @@
         # Sanity check
         # Do the transofrmation only when x and y are empty
-        has_err_x = not (dx == None or len(dx) == 0)
-        has_err_y = not (dy == None or len(dy) == 0)
+        has_err_x = not (dx is None or len(dx) == 0)
+        has_err_y = not (dy is None or len(dy) == 0)
 
         if(x != None) and (y != None):
-            if not dx == None and not len(dx) == 0 and not len(x) == len(dx):
+            if not dx is None and not len(dx) == 0 and not len(x) == len(dx):
                 msg = "Plottable.View: Given x and dx are not"
                 msg += " of the same length"
@@ -693 +693 @@
                 raise ValueError, msg
 
-            if not dy == None and not len(dy) == 0 and not len(y) == len(dy):
+            if not dy is None and not len(dy) == 0 and not len(y) == len(dy):
                 msg = "Plottable.View: Given y and dy are not of the same "
                 msg += "length: len(y)=%s, len(dy)=%s" % (len(y), len(dy))
@@ -797 +797 @@
         tempy = []
         tempdy = []
-        if self.dx == None:
+        if self.dx is None:
             self.dx = np.zeros(len(self.x))
-        if self.dy == None:
+        if self.dy is None:
             self.dy = np.zeros(len(self.y))
         if self.xLabel == "log10(x)":
@@ -827 +827 @@
         tempy = []
         tempdy = []
-        if self.dx == None:
+        if self.dx is None:
             self.dx = np.zeros(len(self.x))
-        if self.dy == None:
+        if self.dy is None:
             self.dy = np.zeros(len(self.y))
         if self.yLabel == "log10(y)":
@@ -860 +860 @@
         tempy = []
         tempdy = []
-        if self.dx == None:
+        if self.dx is None:
             self.dx = np.zeros(len(self.x))
-        if self.dy == None:
+        if self.dy is None:
             self.dy = np.zeros(len(self.y))
         if xmin != None and xmax != None:
@@ -1206 +1206 @@
         """
         """
-        if  self._chisq == None:
+        if  self._chisq is None:
             chisqTxt = r'$\chi^2=$'
         else: