Changeset ac07a3a in sasview for src/sas/sascalc

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/sascalc

Files:

• fit/Loader.py (modified) (1 diff)
• pr/fit/Loader.py (modified) (1 diff)
• pr/invertor.py (modified) (1 diff)
• pr/num_term.py (modified) (1 diff)

src/sas/sascalc/fit/Loader.py

@@ -34 +34 @@
     def set_values(self):
         """ Store the values loaded from file in local variables"""
-        if not self.filename is None:
+        if self.filename is not None:
             input_f =  open(self.filename, 'r')
             buff = input_f.read()

src/sas/sascalc/pr/fit/Loader.py

@@ -34 +34 @@
     def set_values(self):
         """ Store the values loaded from file in local variables"""
-        if not self.filename is None:
+        if self.filename is not None:
             input_f =  open(self.filename, 'r')
             buff = input_f.read()

src/sas/sascalc/pr/invertor.py

@@ -395 +395 @@
         Check q-value against user-defined range
         """
-        if not self.q_min is None and q < self.q_min:
+        if self.q_min is not None and q < self.q_min:
             return False
-        if not self.q_max is None and q > self.q_max:
+        if self.q_max is not None and q > self.q_max:
             return False
         return True

src/sas/sascalc/pr/num_term.py

@@ -159 +159 @@
     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()