Fix imports after rebase, plus some reordering.

anntzer · anntzer · commit 9a077e8e489f · 2017-07-29T16:41:34.000-07:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -16,16 +16,13 @@
 import matplotlib
 from matplotlib import _preprocess_data
 
-from matplotlib._backports import numpy as _backports_np
 import matplotlib.cbook as cbook
-from matplotlib.cbook import (
-    mplDeprecation, STEP_LOOKUP_MAP, iterable, safe_first_element)
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
 import matplotlib.contour as mcontour
 import matplotlib.category as _  # <-registers a category unit converter
 import matplotlib.dates as _  # <-registers a date unit converter
-from matplotlib import docstring
+import matplotlib.docstring as docstring
 import matplotlib.image as mimage
 import matplotlib.legend as mlegend
 import matplotlib.lines as mlines
@@ -41,9 +38,10 @@
 import matplotlib.ticker as mticker
 import matplotlib.transforms as mtransforms
 import matplotlib.tri as mtri
+from matplotlib.cbook import (
+    _backports, mplDeprecation, STEP_LOOKUP_MAP, iterable, safe_first_element)
 from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
-from matplotlib.axes._base import _AxesBase
-from matplotlib.axes._base import _process_plot_format
+from matplotlib.axes._base import _AxesBase, _process_plot_format
 
 
 rcParams = matplotlib.rcParams
@@ -2138,7 +2136,7 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
         self.add_container(bar_container)
 
         if tick_labels is not None:
-            tick_labels = _backports_np.broadcast_to(tick_labels, len(patches))
+            tick_labels = _backports.broadcast_to(tick_labels, len(patches))
             tick_label_axis.set_ticks(tick_label_position)
             tick_label_axis.set_ticklabels(tick_labels)
 
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -149,7 +149,7 @@ def line_2d_to_3d(line, zs=0, zdir='z'):
 def path_to_3d_segment(path, zs=0, zdir='z'):
     '''Convert a path to a 3D segment.'''
 
-    zs = _backports_np.broadcast_to(zs, len(path))
+    zs = _backports.broadcast_to(zs, len(path))
     pathsegs = path.iter_segments(simplify=False, curves=False)
     seg = [(x, y, z) for (((x, y), code), z) in zip(pathsegs, zs)]
     seg3d = [juggle_axes(x, y, z, zdir) for (x, y, z) in seg]
@@ -161,7 +161,7 @@ def paths_to_3d_segments(paths, zs=0, zdir='z'):
     Convert paths from a collection object to 3D segments.
     '''
 
-    zs = _backports_np.broadcast_to(zs, len(paths))
+    zs = _backports.broadcast_to(zs, len(paths))
     segs = [path_to_3d_segment(path, pathz, zdir)
             for path, pathz in zip(paths, zs)]
     return segs
@@ -170,7 +170,7 @@ def paths_to_3d_segments(paths, zs=0, zdir='z'):
 def path_to_3d_segment_with_codes(path, zs=0, zdir='z'):
     '''Convert a path to a 3D segment with path codes.'''
 
-    zs = _backports_np.broadcast_to(zs, len(path))
+    zs = _backports.broadcast_to(zs, len(path))
     seg = []
     codes = []
     pathsegs = path.iter_segments(simplify=False, curves=False)
@@ -186,7 +186,7 @@ def paths_to_3d_segments_with_codes(paths, zs=0, zdir='z'):
     Convert paths from a collection object to 3D segments with path codes.
     '''
 
-    zs = _backports_np.broadcast_to(zs, len(paths))
+    zs = _backports.broadcast_to(zs, len(paths))
     segments = []
     codes_list = []
     for path, pathz in zip(paths, zs):
@@ -260,7 +260,7 @@ def __init__(self, *args, **kwargs):
         self.set_3d_properties(zs, zdir)
 
     def set_3d_properties(self, verts, zs=0, zdir='z'):
-        zs = _backports_np.broadcast_to(zs, len(verts))
+        zs = _backports.broadcast_to(zs, len(verts))
         self._segment3d = [juggle_axes(x, y, z, zdir)
                            for ((x, y), z) in zip(verts, zs)]
         self._facecolor3d = Patch.get_facecolor(self)
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -20,11 +20,15 @@
 
 import numpy as np
 
-from matplotlib import (
-    axes as maxes, cbook, collections as mcoll, colors as mcolors, docstring,
-    scale as mscale, transforms as mtransforms)
-from matplotlib._backports import numpy as _backports_np
+import matplotlib.axes as maxes
+import matplotlib.cbook as cbook
+import matplotlib.collections as mcoll
+import matplotlib.colors as mcolors
+import matplotlib.docstring as docstring
+import matplotlib.scale as mscale
+import matplotlib.transforms as mtransforms
 from matplotlib.axes import Axes, rcParams
+from matplotlib.cbook import _backports
 from matplotlib.colors import Normalize, LightSource
 from matplotlib.transforms import Bbox
 from matplotlib.tri.triangulation import Triangulation
@@ -1534,7 +1538,7 @@ def plot(self, xs, ys, *args, **kwargs):
         zdir = kwargs.pop('zdir', 'z')
 
         # Match length
-        zs = _backports_np.broadcast_to(zs, len(xs))
+        zs = _backports.broadcast_to(zs, len(xs))
 
         lines = super(Axes3D, self).plot(xs, ys, *args, **kwargs)
         for line in lines:
@@ -2338,7 +2342,7 @@ def scatter(self, xs, ys, zs=0, zdir='z', s=20, c=None, depthshade=True,
         patches = super(Axes3D, self).scatter(
             xs, ys, s=s, c=c, *args, **kwargs)
         is_2d = not cbook.iterable(zs)
-        zs = _backports_np.broadcast_to(zs, len(xs))
+        zs = _backports.broadcast_to(zs, len(xs))
         art3d.patch_collection_2d_to_3d(patches, zs=zs, zdir=zdir,
                                         depthshade=depthshade)
 
@@ -2377,7 +2381,7 @@ def bar(self, left, height, zs=0, zdir='z', *args, **kwargs):
 
         patches = super(Axes3D, self).bar(left, height, *args, **kwargs)
 
-        zs = _backports_np.broadcast_to(zs, len(left))
+        zs = _backports.broadcast_to(zs, len(left))
 
         verts = []
         verts_zs = []
