Merge pull request #2949 from tacaswell/np_version_purge

efiring · efiring · commit adae051f7ac6 · 2014-04-02T16:20:16.000-10:00
CLN : removed version check that required numpy &gt; 1.2
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -50,18 +50,13 @@
                         unicode_literals)
 
 import six
-from six.moves import map, zip
+from six.moves import zip
 
 import re
 import numpy as np
 from numpy import ma
 import matplotlib.cbook as cbook
 
-parts = np.__version__.split('.')
-NP_MAJOR, NP_MINOR = list(map(int, parts[:2]))
-# true if clip supports the out kwarg
-NP_CLIP_OUT = NP_MAJOR >= 1 and NP_MINOR >= 2
-
 cnames = {
     'aliceblue':            '#F0F8FF',
     'antiquewhite':         '#FAEBD7',
@@ -577,10 +572,7 @@ def __call__(self, X, alpha=None, bytes=False):
             # conversion of large positive values to negative integers.
 
             xa *= self.N
-            if NP_CLIP_OUT:
-                np.clip(xa, -1, self.N, out=xa)
-            else:
-                xa = np.clip(xa, -1, self.N)
+            np.clip(xa, -1, self.N, out=xa)
 
             # ensure that all 'under' values will still have negative
             # value after casting to int
