Changeset 235f514 in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Apr 9, 2017 5:46:10 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:

ac07a3a

Parents:

5b2b04d

Message:

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

Location:

src/sas/sascalc/dataloader/readers

Files:

• ascii_reader.py (modified) (1 diff)
• cansas_reader.py (modified) (6 diffs)
• danse_reader.py (modified) (2 diffs)
• xml_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/ascii_reader.py

@@ -128 +128 @@
                         if new_lentoks > 2:
                             _dy = float(toks[2])
-                        has_error_dy = False if _dy == None else True
+                        has_error_dy = False if _dy is None else True
 
                         # If a 4th row is present, consider it dx
                         if new_lentoks > 3:
                             _dx = float(toks[3])
-                        has_error_dx = False if _dx == None else True
+                        has_error_dx = False if _dx is None else True
 
                         # Delete the previously stored lines of data candidates if

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -807 +807 @@
         :param data1d: presumably a Data1D object
         """
-        if self.current_dataset == None:
+        if self.current_dataset is None:
             x_vals = np.empty(0)
             y_vals = np.empty(0)
@@ -895 +895 @@
         # Write the file
         file_ref = open(filename, 'w')
-        if self.encoding == None:
+        if self.encoding is None:
             self.encoding = "UTF-8"
         doc.write(file_ref, encoding=self.encoding,
@@ -1015 +1015 @@
         :param entry_node: lxml node ElementTree object to be appended to
         """
-        if datainfo.run == None or datainfo.run == []:
+        if datainfo.run is None or datainfo.run == []:
             datainfo.run.append(RUN_NAME_DEFAULT)
             datainfo.run_name[RUN_NAME_DEFAULT] = RUN_NAME_DEFAULT
@@ -1213 +1213 @@
                                  str(datainfo.source.name))
         self.append(source, instr)
-        if datainfo.source.radiation == None or datainfo.source.radiation == '':
+        if datainfo.source.radiation is None or datainfo.source.radiation == '':
             datainfo.source.radiation = "neutron"
         self.write_node(source, "radiation", datainfo.source.radiation)
@@ -1254 +1254 @@
         :param instr: lxml node ElementTree object to be appended to
         """
-        if datainfo.collimation == [] or datainfo.collimation == None:
+        if datainfo.collimation == [] or datainfo.collimation is None:
             coll = Collimation()
             datainfo.collimation.append(coll)
@@ -1299 +1299 @@
         :param inst: lxml instrument node to be appended to
         """
-        if datainfo.detector == None or datainfo.detector == []:
+        if datainfo.detector is None or datainfo.detector == []:
             det = Detector()
             det.name = ""

src/sas/sascalc/dataloader/readers/danse_reader.py

@@ -166 +166 @@
                 
                 x_vals.append(qx)
-                if xmin == None or qx < xmin:
+                if xmin is None or qx < xmin:
                     xmin = qx
-                if xmax == None or qx > xmax:
+                if xmax is None or qx > xmax:
                     xmax = qx
             
@@ -181 +181 @@
                 
                 y_vals.append(qy)
-                if ymin == None or qy < ymin:
+                if ymin is None or qy < ymin:
                     ymin = qy
-                if ymax == None or qy > ymax:
+                if ymax is None or qy > ymax:
                     ymax = qy
             

src/sas/sascalc/dataloader/readers/xml_reader.py

@@ -240 +240 @@
         :param name: The name of the element to be created
         """
-        if attrib == None:
+        if attrib is None:
             attrib = {}
         return etree.Element(name, attrib, nsmap)
@@ -299 +299 @@
         """
         text = str(text)
-        if attrib == None:
+        if attrib is None:
             attrib = {}
         elem = E(elementname, attrib, text)