MNT: minor fixes

Fix sundry import/py3 compatibility issues
matplotlib · rmorshea · Aug 6, 2015 · Jul 20, 2015 · Jul 21, 2015 · Jul 23, 2015
commit d8950897744e1126f2ec6fa424a2b961f2ec6a46
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -18,9 +18,8 @@
 from .traitlets import (Instance, Configurable, TransformInstance, Bool, Undefined, Union,
                         BaseDescriptor, getargspec, PrivateMethodMixin, Float, TraitError,
                         Unicode, Stringlike, Callable, Tuple, List, observe, validate, default,
-                        retrieve)
+                        retrieve, _traitlets_deprecation_msg)
 
-from urlparse import urlparse
 
 # Note, matplotlib artists use the doc strings for set and get
 # methods to enable the introspection methods of setp and getp.  Every
@@ -1709,8 +1708,3 @@ def kwdoc(a):
         return '\n'.join(ArtistInspector(a).pprint_setters(leadingspace=2))
 
 docstring.interpd.update(Artist=kwdoc(Artist))
-
-def _traitlets_deprecation_msg(name):
-    msg = ("This has been deprecated to make way for IPython's Traitlets."
-           " Please use the '%s' TraitType and Traitlet event decorators.")
-    return msg % name
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -31,7 +31,7 @@
 # really belong.
 from matplotlib.markers import TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN
 from matplotlib.markers import CARETLEFT, CARETRIGHT, CARETUP, CARETDOWN
-
+from .cbook import mplDeprecation
 from .traitlets import observe, _traitlets_deprecation_msg
 
 
@@ -584,14 +584,14 @@ def get_window_extent(self, renderer):
     @observe('axes')
     def _axes_changed(self, change):
         new = change['new']
-    	Artist._axes_changed(self, change)
+        Artist._axes_changed(self, change)
         if new is not None:
             if new.xaxis is not None:
                 self._xcid = new.xaxis.callbacks.connect('units',
-                                                	   self.recache_always)
+                                                           self.recache_always)
             if new.yaxis is not None:
                 self._ycid = new.yaxis.callbacks.connect('units',
-                                    	               self.recache_always)
+                                                       self.recache_always)
 
     def set_data(self, *args):
         """

diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -5,7 +5,7 @@
 
 from matplotlib.externals import six
 from matplotlib.externals.six.moves import map, zip
-
+import warnings
 import math
 
 import matplotlib as mpl
@@ -17,6 +17,7 @@
 from matplotlib import docstring
 import matplotlib.transforms as transforms
 from matplotlib.path import Path
+from .cbook import mplDeprecation
 
 from matplotlib.bezier import split_bezier_intersecting_with_closedpath
 from matplotlib.bezier import get_intersection, inside_circle, get_parallels

diff --git a/lib/matplotlib/traitlets.py b/lib/matplotlib/traitlets.py
@@ -271,9 +271,9 @@ class Stringlike(Unicode):
     info_text = 'string or unicode interpretable'
 
     def validate(self, obj, value):
-        if not isinstance(value, (str,unicode)):
+        if not isinstance(value, six.text_type):
             if hasattr(value,'__unicode__'):
-                value = unicode(value)
+                value = six.text_type(value)
             elif hasattr(value, '__str__'):
                 value = str(value)
         return super(Stringlike,self).validate(obj,value)
@@ -385,7 +385,7 @@ def validate(self, obj, value):
         elif isinstance(value, str) and value in self.named_colors:
             value = self.validate(obj, self.named_colors[value])
             in_range = True
-            
+
         if in_range:
             # Convert to hex color string
             if self._metadata['as_hex']:
@@ -397,12 +397,17 @@ def validate(self, obj, value):
 
             # If no alpha provided, use default_alpha, also round the output
             if len(value) == 3:
-                value = tuple(np.round((value[0], value[1], value[2], 
+                value = tuple(np.round((value[0], value[1], value[2],
                              self._metadata['default_alpha']),5).tolist())
             elif len(value) == 4:
             # If no alpha provided, use default_alpha
                 value = tuple(np.round(value,5).tolist())
 
             return value
 
-        self.error(obj, value)
+        self.error(obj, value)
+
+def _traitlets_deprecation_msg(name):
+    msg = ("This has been deprecated to make way for IPython's Traitlets."
+           " Please use the '%s' TraitType and Traitlet event decorators.")
+    return msg % name