Changeset 4342fed0 in sasview for src/sas/sascalc/data_util/qsmearing.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/sascalc/data_util/qsmearing.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -42 +42 @@
     # This checks for 2D data (does not throw exception because fail is common)
     if  data.__class__.__name__ not in ['Data1D', 'Theory1D']:
-        if data == None:
+        if data is None:
             return None
-        elif data.dqx_data == None or data.dqy_data == None:
+        elif data.dqx_data is None or data.dqy_data is None:
             return None
         return PySmear2D(data)