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

Timestamp:

Apr 9, 2017 6: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 06:09:12)

git-committer:

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

Message:

Merge pull request #67 from andyfaff/is_none

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

File:

• src/sas/sasgui/plottools/plottable_interactor.py (modified) (4 diffs)

src/sas/sasgui/plottools/plottable_interactor.py

@@ -50 +50 @@
             l_width = markersize * 0.4
             return self.step(x=x, y=y, color=color, label=label, width=l_width)
-        if not self.marker == None:
-            self.base.connect.clear([self.marker])
-        self.color = self._color(color)
-        if self.markersize != None:
+        if self.marker is not None:
+            self.base.connect.clear([self.marker])
+        self.color = self._color(color)
+        if self.markersize is not None:
             markersize = self.markersize
         # Convert tuple (lo,hi) to array [(x-lo),(hi-x)]
-        if dx != None and type(dx) == type(()):
+        if dx is not None and type(dx) == type(()):
             dx = nx.vstack((x - dx[0], dx[1] - x)).transpose()
-        if dy != None and type(dy) == type(()):
+        if dy is not None and type(dy) == type(()):
             dy = nx.vstack((y - dy[0], dy[1] - y)).transpose()
 
-        if dx == None and dy == None:
+        if dx is None and dy is None:
             # zorder = 1
             self.marker = self.axes.plot(x, y, color=self.color,
@@ -100 +100 @@
         """
         """
-        if not self.marker == None:
+        if self.marker is not None:
             self.base.connect.clear([self.marker])
         self.color = self._color(color)
@@ -115 +115 @@
         """
         """
-        if not self.marker == None:
+        if self.marker is not None:
             self.base.connect.clear([self.marker])
         self.color = self._color(color)
@@ -133 +133 @@
         """
         """
-        if not self.marker == None:
+        if self.marker is not None:
             self.base.connect.clear([self.marker])
         self.color = self._color(color)