Changeset ac07a3a in sasview for src/sas/sasgui/guiframe

Timestamp:

Apr 9, 2017 6:08:43 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:

7432acb

Parents:

235f514

Message:

MAINT: replace 'not x is None' by 'x is not None'

Location:

src/sas/sasgui/guiframe

Files:

• data_processor.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• local_perspectives/plotting/Plotter2D.py (modified) (3 diffs)
• local_perspectives/plotting/masking.py (modified) (1 diff)

src/sas/sasgui/guiframe/data_processor.py

@@ -1017 +1017 @@
                             if index - 1 >= 0:
                                 new_row, _ = temp_list[index - 1]
-                                if not new_row is None and new_row != ' ':
+                                if new_row is not None and new_row != ' ':
                                     label += create_label(col_name, None,
                                                           int(new_row) + 1)
@@ -1025 +1025 @@
                             if index + 1 < len(temp_list):
                                 new_row, _ = temp_list[index + 1]
-                                if not new_row is None:
+                                if new_row is not None:
                                     label += create_label(col_name,
                                                           int(new_row) + 1, None)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -618 +618 @@
             # add menu of other plugins
             item_list = self.parent.get_current_context_menu(self)
-            if (not item_list is None) and (not len(item_list) == 0):
+            if (item_list is not None) and (len(item_list)):
                 for item, wx_id in zip(item_list, [ids.next() for i in range(len(item_list))]):
-
                     try:
                         plot_menu.Append(wx_id, item[0], name)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -320 +320 @@
         if len(self.data2D.detector) <= 1:
             item_list = self.parent.get_current_context_menu(self)
-            if (not item_list is None) and (not len(item_list) == 0) and\
-                self.data2D.name.split(" ")[0] != 'Residuals':
+            if ((item_list is not None) and len(item_list) and
+                self.data2D.name.split(" ")[0] != 'Residuals'):
                 for item, wx_id in zip(item_list, [ids.next() for i in range(len(item_list))]):
                     try:
@@ -533 +533 @@
         """
         ## Clear current slicer
-        if not self.slicer is None:
+        if self.slicer is not None:
             self.slicer.clear()
         ## Create a new slicer
@@ -719 +719 @@
         Clear the slicer on the plot
         """
-        if not self.slicer is None:
+        if self.slicer is not None:
             self.slicer.clear()
             self.subplot.figure.canvas.draw()

src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py

@@ -249 +249 @@
         Add new mask to old mask
         """
-        if not self.slicer is None:
+        if self.slicer is not None:
             data = Data2D()
             data = self.data