Changeset bb81385 in sasview for src/sas/sasgui/perspectives/pr

Timestamp:

Apr 7, 2017 1:33:11 AM (7 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/perspectives/pr

Files:

• inversion_panel.py (modified) (1 diff)
• pr.py (modified) (1 diff)

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()