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

Timestamp:

Apr 9, 2017 6:08:43 AM (8 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/perspectives

Files:

• calculator/gen_scatter_panel.py (modified) (1 diff)
• pr/pr.py (modified) (11 diffs)
• pr/pr_thread.py (modified) (3 diffs)

src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py

@@ -1914 +1914 @@
             return
         self.sld_data = data
-        enable = (not data is None)
+        enable = (data is not None)
         self._set_omfpanel_sld_data(self.sld_data)
         self.omfpanel.bt_save.Enable(enable)

src/sas/sasgui/perspectives/pr/pr.py

@@ -291 +291 @@
         """
         qtemp = pr.x
-        if not q is None:
+        if q is not None:
             qtemp = q
 
@@ -303 +303 @@
 
         # Check for user min/max
-        if not pr.q_min is None:
+        if pr.q_min is not None:
             minq = pr.q_min
-        if not pr.q_max is None:
+        if pr.q_max is not None:
             maxq = pr.q_max
 
@@ -487 +487 @@
         scale = None
         min_err = 0.0
-        if not path is None:
+        if path is not None:
             input_f = open(path, 'r')
             buff = input_f.read()
@@ -512 +512 @@
                     logger.error(sys.exc_value)
 
-        if not scale is None:
+        if scale is not None:
             message = "The loaded file had no error bars, statistical errors are assumed."
             wx.PostEvent(self.parent, StatusEvent(status=message))
@@ -537 +537 @@
 
         data_started = False
-        if not path is None:
+        if path is not None:
             input_f = open(path, 'r')
             buff = input_f.read()
@@ -565 +565 @@
                     data_started = True
 
-        if not scale is None:
+        if scale is not None:
             message = "The loaded file had no error bars, statistical errors are assumed."
             wx.PostEvent(self.parent, StatusEvent(status=message))
@@ -761 +761 @@
         self.elapsed = elapsed
         self.control_panel.alpha_estimate = alpha
-        if not message is None:
+        if message is not None:
             wx.PostEvent(self.parent, StatusEvent(status=str(message)))
         self.perform_estimateNT()
@@ -779 +779 @@
         self.control_panel.nterms_estimate = nterms
         self.control_panel.alpha_estimate = alpha
-        if not message is None:
+        if message is not None:
             wx.PostEvent(self.parent, StatusEvent(status=str(message)))
 
@@ -921 +921 @@
         try:
             pr = self._create_plot_pr()
-            if not pr is None:
+            if pr is not None:
                 self.pr = pr
                 self.perform_inversion()
@@ -944 +944 @@
         try:
             pr = self._create_plot_pr()
-            if not pr is None:
+            if pr is not None:
                 self.pr = pr
                 self.perform_estimate()
@@ -1024 +1024 @@
         try:
             pr = self._create_file_pr(data)
-            if not pr is None:
+            if pr is not None:
                 self.pr = pr
                 self.perform_inversion()

src/sas/sasgui/perspectives/pr/pr_thread.py

@@ -42 +42 @@
             pass
         except:
-            if not self.error_func is None:
+            if self.error_func is not None:
                 self.error_func("CalcPr.compute: %s" % sys.exc_value)
 
@@ -70 +70 @@
             pass
         except:
-            if not self.error_func is None:
+            if self.error_func is not None:
                 self.error_func("EstimatePr.compute: %s" % sys.exc_value)
 
@@ -110 +110 @@
             pass
         except:
-            if not self.error_func is None:
+            if self.error_func is not None:
                 self.error_func("EstimatePr2.compute: %s" % sys.exc_value)