Merge pull request #4057 from WeatherGod/mplot3d/fix_future_warning

tacaswell · tacaswell · commit 513ff6837d22 · 2015-01-31T12:33:17.000-05:00
MNT : Avoid comparing None &amp; numpy arrays
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1008,8 +1008,11 @@ def mouse_init(self, rotate_btn=1, zoom_btn=3):
         else:
             warnings.warn('Axes3D.figure.canvas is \'None\', mouse rotation disabled.  Set canvas then call Axes3D.mouse_init().')
 
-        self._rotate_btn = np.atleast_1d(rotate_btn)
-        self._zoom_btn = np.atleast_1d(zoom_btn)
+        # coerce scalars into array-like, then convert into
+        # a regular list to avoid comparisons against None
+        # which breaks in recent versions of numpy.
+        self._rotate_btn = np.atleast_1d(rotate_btn).tolist()
+        self._zoom_btn = np.atleast_1d(zoom_btn).tolist()
 
     def can_zoom(self) :
         """
