Changeset bb81385 in sasview for src/sas/sasgui

Timestamp:

Apr 7, 2017 1:33:11 AM (8 years ago)

Author:

GitHub <noreply@…>

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:

861f1880

Parents:

87d44c7 (diff), c1d5aea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (04/07/17 01:33:11)

git-committer:

GitHub <noreply@…> (04/07/17 01:33:11)

Message:

Merge pull request #65 from andyfaff/not_is

MAINT: use 'x is not None', instead of 'not x is None'.

Location:

src/sas/sasgui

Files:

• guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• perspectives/calculator/image_viewer.py (modified) (1 diff)
• perspectives/pr/inversion_panel.py (modified) (1 diff)
• perspectives/pr/pr.py (modified) (1 diff)
• plottools/PlotPanel.py (modified) (2 diffs)
• guiframe/gui_manager.py (modified) (1 diff)

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -92 +92 @@
         if dlg.ShowModal() == wx.ID_OK:
             file_list = dlg.GetPaths()
-            if len(file_list) >= 0 and not file_list[0] is None:
+            if len(file_list) >= 0 and file_list[0] is not None:
                 self._default_save_location = os.path.dirname(file_list[0])
                 path = self._default_save_location

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

@@ -42 +42 @@
         """
         parent = self.parent
-        if parent == None:
+        if parent is None:
             location = os.getcwd()
         else:
             location = parent._default_save_location
         path_list = self.choose_data_file(location=location)
-        if path_list == None:
+        if path_list is None:
             return
-        if len(path_list) >= 0 and not(path_list[0]is None):
-            if parent != None:
+        if len(path_list) >= 0 and path_list[0] is not None:
+            if parent is not None:
                 parent._default_save_location = os.path.dirname(path_list[0])
         err_msg = ''

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

@@ -940 +940 @@
         Choose a new input file for I(q)
         """
-        if not self._manager is None:
+        if self._manager is not None:
             self.plot_data.SetValue(str(data.name))
             try:

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

@@ -1047 +1047 @@
         try:
             pr = self._create_file_pr(data)
-            if not pr is None:
+            if pr is not None:
                 self.pr = pr
                 self.perform_estimate()

src/sas/sasgui/plottools/PlotPanel.py

@@ -1403 +1403 @@
         if self.scale == 'log_{10}':
             self.scale = 'linear'
-            if not self.zmin_2D is None:
+            if self.zmin_2D is not None:
                 zmin_2D_temp = math.pow(10, self.zmin_2D)
-            if not self.zmax_2D is None:
+            if self.zmax_2D is not None:
                 zmax_2D_temp = math.pow(10, self.zmax_2D)
         else:
             self.scale = 'log_{10}'
-            if not self.zmin_2D is None:
+            if self.zmin_2D is not None:
                 # min log value: no log(negative)
                 if self.zmin_2D <= 0:
@@ -1415 +1415 @@
                 else:
                     zmin_2D_temp = math.log10(self.zmin_2D)
-            if not self.zmax_2D is None:
+            if self.zmax_2D is not None:
                 zmax_2D_temp = math.log10(self.zmax_2D)
 

src/sas/sasgui/guiframe/gui_manager.py

@@ -2122 +2122 @@
         """
         if custom_config is not None:
-            sas_opencl = os.environ.get("SAS_OPENCL",None)
+            sas_opencl = os.environ.get("SAS_OPENCL")
             new_config_lines = []
             config_file = open(custom_config.__file__)