Index: src/sas/sasgui/perspectives/calculator/calculator.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/calculator.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/calculator.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -93,5 +93,5 @@
         Edit meta data
         """
-        if self.data_edit_frame == None:
+        if self.data_edit_frame is None:
             self.data_edit_frame = DataEditorWindow(parent=self.parent,
                                                     manager=self, data=[],
@@ -106,5 +106,5 @@
         Data operation
         """
-        if self.data_operator_frame == None:
+        if self.data_operator_frame is None:
             # Use one frame all the time
             self.data_operator_frame = DataOperatorWindow(parent=self.parent,
@@ -121,5 +121,5 @@
         Compute the Kiessig thickness
         """
-        if self.kiessig_frame == None:
+        if self.kiessig_frame is None:
             frame = KiessigWindow(parent=self.parent, manager=self)
             self.put_icon(frame)
@@ -133,5 +133,5 @@
         Compute the scattering length density of molecula
         """
-        if self.sld_frame == None:
+        if self.sld_frame is None:
             frame = SldWindow(parent=self.parent,
                                   base=self.parent, manager=self)
@@ -146,5 +146,5 @@
         Compute the mass density or molar voulme
         """
-        if self.cal_md_frame == None:
+        if self.cal_md_frame is None:
             frame = DensityWindow(parent=self.parent,
                                   base=self.parent, manager=self)
@@ -159,5 +159,5 @@
         Compute the slit size a given data
         """
-        if self.cal_slit_frame == None:
+        if self.cal_slit_frame is None:
             frame = SlitLengthCalculatorWindow(parent=self.parent, manager=self)
             self.put_icon(frame)
@@ -171,5 +171,5 @@
         Estimate the instrumental resolution
         """
-        if self.cal_res_frame == None:
+        if self.cal_res_frame is None:
             frame = ResolutionWindow(parent=self.parent, manager=self)
             self.put_icon(frame)
@@ -183,5 +183,5 @@
         On Generic model menu event
         """
-        if self.gen_frame == None:
+        if self.gen_frame is None:
             frame = SasGenWindow(parent=self.parent, manager=self)
             self.put_icon(frame)
@@ -214,5 +214,5 @@
         :param filename: file name to open in editor
         """
-        if self.py_frame == None:
+        if self.py_frame is None:
             frame = PyConsole(parent=self.parent, base=self,
                               filename=filename)
Index: src/sas/sasgui/perspectives/calculator/data_editor.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/data_editor.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/data_editor.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -419,5 +419,5 @@
         """
         path = None
-        if location == None:
+        if location is None:
             location = os.getcwd()
 
Index: src/sas/sasgui/perspectives/calculator/data_operator.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/data_operator.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/data_operator.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -198,5 +198,5 @@
         self.send_warnings('')
         msg = ''
-        if name == None:
+        if name is None:
             text = self.data_namectr.GetValue().strip()
         else:
@@ -205,5 +205,5 @@
         name_list = []
         for state in state_list:
-            if state.data == None:
+            if state.data is None:
                 theory_list = state.get_theory()
                 theory, _ = theory_list.values()[0]
@@ -278,5 +278,5 @@
         pos = item.GetCurrentSelection()
         data = item.GetClientData(pos)
-        if data == None:
+        if data is None:
             content = "?"
             self.put_text_pic(self.data1_pic, content)
@@ -313,5 +313,5 @@
         content = "?"
         if not (self.numberctr.IsShown() and self.numberctr.IsEnabled()):
-            if data == None:
+            if data is None:
                 content = "?"
                 self.put_text_pic(self.data2_pic, content)
@@ -355,5 +355,5 @@
         pos1 = self.data1_cbox.GetCurrentSelection()
         data1 = self.data1_cbox.GetClientData(pos1)
-        if data1 == None:
+        if data1 is None:
             self.output = None
             return flag
@@ -361,5 +361,5 @@
         data2 = self.data2_cbox.GetClientData(pos2)
 
-        if data2 == None:
+        if data2 is None:
             self.output = None
             return flag
@@ -422,5 +422,5 @@
         """
         out = self.out_pic
-        if output == None:
+        if output is None:
             content = "?"
             self.put_text_pic(out, content)
@@ -592,5 +592,5 @@
         name_list = []
         for state in state_list:
-            if state.data == None:
+            if state.data is None:
                 theory_list = state.get_theory()
                 theory, _ = theory_list.values()[0]
@@ -609,5 +609,5 @@
             wx.MessageBox(msg, 'Error')
             return
-        if self.output == None:
+        if self.output is None:
             msg = "No Output Data has been generated...   "
             wx.MessageBox(msg, 'Error')
Index: src/sas/sasgui/perspectives/calculator/density_panel.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/density_panel.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/density_panel.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -239,5 +239,5 @@
         update units and output combobox
         """
-        if event == None:
+        if event is None:
             return
         event.Skip()
@@ -257,5 +257,5 @@
         update units and input combobox
         """
-        if event == None:
+        if event is None:
             return
         event.Skip()
Index: src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -487,5 +487,5 @@
         path = None
         filename = ''
-        if location == None:
+        if location is None:
             location = os.getcwd()
 
@@ -864,5 +864,5 @@
             return
         self.sld_data = self.parent.get_sld_from_omf()
-        if self.sld_data == None:
+        if self.sld_data is None:
             if self.parent.parent != None:
                 infor = 'Error'
@@ -880,5 +880,5 @@
             self.model.set_sld_data(self.sld_data)
             self.set_input_params()
-            if self.is_avg or self.is_avg == None:
+            if self.is_avg or self.is_avg is None:
                 self._create_default_1d_data()
                 i_out = np.zeros(len(self.data.y))
@@ -979,5 +979,5 @@
         Update the progress bar
         """
-        if self.parent.parent == None:
+        if self.parent.parent is None:
             return
         type = "progress"
@@ -1010,5 +1010,5 @@
                 out = np.append(out, outi)
         #print time.time() - s
-        if self.is_avg or self.is_avg == None:
+        if self.is_avg or self.is_avg is None:
             self._draw1D(out)
         else:
@@ -1287,13 +1287,13 @@
             key_low = key.lower()
             if key_low.count('mx') > 0:
-                if sld_sets[key] == None:
+                if sld_sets[key] is None:
                     sld_sets[key] = self.sld_data.sld_mx
                 mx = sld_sets[key]
             elif key_low.count('my') > 0:
-                if sld_sets[key] == None:
+                if sld_sets[key] is None:
                     sld_sets[key] = self.sld_data.sld_my
                 my = sld_sets[key]
             elif key_low.count('mz') > 0:
-                if sld_sets[key] == None:
+                if sld_sets[key] is None:
                     sld_sets[key] = self.sld_data.sld_mz
                 mz = sld_sets[key]
@@ -1368,5 +1368,5 @@
         """
 
-        if omfdata == None:
+        if omfdata is None:
             self._set_none_text()
             return
@@ -1437,5 +1437,5 @@
         self.slds = []
         omfdata = self.sld_data
-        if omfdata == None:
+        if omfdata is None:
             raise
         sld_key_list = self._get_slds_key_list(omfdata)
@@ -1477,5 +1477,5 @@
         self.nodes = []
         omfdata = self.sld_data
-        if omfdata == None:
+        if omfdata is None:
             raise
         key_list = self._get_nodes_key_list(omfdata)
@@ -1512,5 +1512,5 @@
         self.stepsize = []
         omfdata = self.sld_data
-        if omfdata == None:
+        if omfdata is None:
             raise
         key_list = self._get_step_key_list(omfdata)
@@ -1631,5 +1631,5 @@
         Set sld textctrls
         """
-        if sld_data == None:
+        if sld_data is None:
             for ctr_list in self.slds:
                 ctr_list[1].Enable(False)
@@ -1739,5 +1739,5 @@
             if npts > 0:
                 nop = self.set_npts_from_slddata()
-                if nop == None:
+                if nop is None:
                     nop = npts
                 self.display_npts(nop)
@@ -1911,8 +1911,8 @@
         Set omfdata
         """
-        if data == None:
+        if data is None:
             return
         self.sld_data = data
-        enable = (not data == None)
+        enable = (not data is None)
         self._set_omfpanel_sld_data(self.sld_data)
         self.omfpanel.bt_save.Enable(enable)
Index: src/sas/sasgui/perspectives/calculator/image_viewer.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/image_viewer.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/image_viewer.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -85,5 +85,5 @@
         """
         path = None
-        if location == None:
+        if location is None:
             location = os.getcwd()
         dlg = wx.FileDialog(self.parent, "Image Viewer: Choose a image file",
Index: src/sas/sasgui/perspectives/calculator/model_editor.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/model_editor.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/model_editor.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -1388,5 +1388,5 @@
 
     def _get_upper_name(self, name=None):
-        if name == None:
+        if name is None:
             return ""
         upper_name = ""
Index: src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -839,5 +839,5 @@
         : Param image: pylab object
         """
-        if image == None:
+        if image is None:
             return
         if color == 'g':
@@ -973,5 +973,5 @@
         if len(qx) != len(qy):
             return None
-        if qx == None or qy == None:
+        if qx is None or qy is None:
             return None
         return qx, qy
@@ -1261,5 +1261,5 @@
         if selection == 'Add new':
             path = self._selectDlg()
-            if path == None:
+            if path is None:
                 self.spectrum_cb.SetValue('Flat')
                 self.resolution.set_spectrum(self.spectrum_dic['Flat'])
@@ -1301,5 +1301,5 @@
         """
         try:
-            if path == None:
+            if path is None:
                 wx.PostEvent(self.parent.parent, StatusEvent(status=\
                             " Selected Distribution was not loaded: %s" % path))
Index: src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py	(revision d0248bd59e16e863c884f4be9af0a03b2a86b6e2)
+++ src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py	(revision 235f514ba93b57fa63e44309f182acef0b98bb55)
@@ -157,5 +157,5 @@
         path = None
         filename = ''
-        if location == None:
+        if location is None:
             location = os.getcwd()
 
