Changeset 235f514 in sasview for src/sas/sasgui/perspectives/invariant

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'

Location:

src/sas/sasgui/perspectives/invariant

Files:

• invariant_panel.py (modified) (11 diffs)
• invariant_state.py (modified) (1 diff)

src/sas/sasgui/perspectives/invariant/invariant_panel.py

@@ -240 +240 @@
         """
 
-        if state == None and data == None:
+        if state is None and data is None:
             self.state = IState()
-        elif state == None or data == None:
+        elif state is None or data is None:
             return
         else:
@@ -604 +604 @@
         compute invariant
         """
-        if self._data == None:
+        if self._data is None:
             msg = "\n\nData must be loaded first in order"
             msg += " to perform a compution..."
@@ -792 +792 @@
         : param state_num: the given state number
         """
-        if state_num == None:
+        if state_num is None:
             return
 
@@ -924 +924 @@
         :param event: rb/cb event
         """
-        if event == None:
+        if event is None:
             return
         obj = event.GetEventObject()
@@ -934 +934 @@
 
         try:
-            if value == None or value.lstrip().rstrip() == '':
+            if value is None or value.lstrip().rstrip() == '':
                 value = 'None'
             setattr(self.state, name, str(value))
@@ -1013 +1013 @@
         Used in 'set_current_data()'
         """
-        #if data == None: return
+        #if data is None: return
         #temp_state = self.state.clone_state()
         #copy.deepcopy(self.state.saved_state)
@@ -1049 +1049 @@
 
         """
-        if self._data == None:
+        if self._data is None:
             return
         # check if this event is from do/undo button
@@ -1072 +1072 @@
         # try to add new state of the text changes in the state_list
         try:
-            if value.strip() == None:
+            if value.strip() is None:
                 value = ''
             setattr(self.state, name, str(value))
@@ -1140 +1140 @@
         the popup menu on bookmark context menu event
         """
-        if self._data == None:
+        if self._data is None:
             return
-        if event == None:
+        if event is None:
             return
         self.bookmark_num += 1
@@ -1206 +1206 @@
         : event: popUpMenu event
         """
-        if event == None:
+        if event is None:
             return
         # get the object
@@ -1246 +1246 @@
         if self.parent != None:
             self._default_save_location = self.parent.get_save_location()
-        if self._default_save_location == None:
+        if self._default_save_location is None:
             self._default_save_location = os.getcwd()
         dlg = wx.FileDialog(self, "Choose a file",

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -787 +787 @@
             raise RuntimeError, msg
         # make sure title and data run is filled up.
-        if datainfo.title == None or datainfo.title == '':
+        if datainfo.title is None or datainfo.title == '':
             datainfo.title = datainfo.name
-        if datainfo.run_name == None or datainfo.run_name == {}:
+        if datainfo.run_name is None or datainfo.run_name == {}:
             datainfo.run = [str(datainfo.name)]
             datainfo.run_name[0] = datainfo.name