Changeset 4342fed0 in sasview for src/sas/sasgui/plottools/fitDialog.py

Timestamp:

Apr 9, 2017 8:09:12 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:

fca1f50

Parents:

5b2b04d (diff), 45dffa69 (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 Butler <butlerpd@…> (04/09/17 08:09:12)

git-committer:

GitHub <noreply@…> (04/09/17 08:09:12)

Message:

Merge pull request #67 from andyfaff/is_none

MAINT: use 'is None' instead of '== None'

File:

• src/sas/sasgui/plottools/fitDialog.py (modified) (5 diffs)

src/sas/sasgui/plottools/fitDialog.py

@@ -95 +95 @@
 
         # Set default value of parameter in the dialog panel
-        if self.Avalue == None:
+        if self.Avalue is None:
             self.tcA.SetValue(format_number(self.default_A))
         else:
             self.tcA.SetLabel(format_number(self.Avalue))
-        if self.Bvalue == None:
+        if self.Bvalue is None:
             self.tcB.SetValue(format_number(self.default_B))
         else:
             self.tcB.SetLabel(format_number(self.Bvalue))
-        if self.ErrAvalue == None:
+        if self.ErrAvalue is None:
             self.tcErrA.SetLabel(format_number(0.0))
         else:
             self.tcErrA.SetLabel(format_number(self.ErrAvalue))
-        if self.ErrBvalue == None:
+        if self.ErrBvalue is None:
             self.tcErrB.SetLabel(format_number(0.0))
         else:
             self.tcErrB.SetLabel(format_number(self.ErrBvalue))
-        if self.Chivalue == None:
+        if self.Chivalue is None:
             self.tcChi.SetLabel(format_number(0.0))
         else:
@@ -502 +502 @@
 
                 # Check that cov and out are iterable before displaying them
-                if cov == None:
+                if cov is None:
                     errA = 0.0
                     errB = 0.0
@@ -508 +508 @@
                     errA = math.sqrt(cov[0][0])
                     errB = math.sqrt(cov[1][1])
-                if out == None:
+                if out is None:
                     cstA = 0.0
                     cstB = 0.0
@@ -579 +579 @@
                     self.I0_tctr.SetValue(format_number(val))
             if self.Rgerr_tctr.IsShown():
-                if rg != None and rg != 0:
+                if rg is not None and rg != 0:
                     value = format_number(3 * float(errA) / (2 * rg))
                 else:
@@ -593 +593 @@
                 self.Diameter_tctr.SetValue(value)
             if self.Diametererr_tctr.IsShown():
-                if rg != None and rg != 0:
+                if rg is not None and rg != 0:
                     value = format_number(8 * float(errA) / _diam)
                 else: