renamed import

tacaswell · tacaswell · commit 5e6962941bfa · 2014-01-13T13:13:57.000-06:00
renamed imported matplotlib.collections from
`collections` -&gt; `mcollections` to try and avoid clashing with
`collections` in python core.
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -19,7 +19,7 @@
 
 import numpy as np
 from numpy import ma
-import matplotlib.collections as collections
+import matplotlib.collections as mcollections
 import matplotlib.transforms as transforms
 import matplotlib.text as mtext
 import matplotlib.artist as martist
@@ -276,7 +276,7 @@ def _init(self):
             self.Q.pivot = _pivot
             kw = self.Q.polykw
             kw.update(self.kw)
-            self.vector = collections.PolyCollection(
+            self.vector = mcollections.PolyCollection(
                                         self.verts,
                                         offsets=[(self.X, self.Y)],
                                         transOffset=self.get_transform(),
@@ -365,7 +365,7 @@ def _parse_args(*args):
     return X, Y, U, V, C
 
 
-class Quiver(collections.PolyCollection):
+class Quiver(mcollections.PolyCollection):
     """
     Specialized PolyCollection for arrows.
 
@@ -412,7 +412,7 @@ def __init__(self, ax, *args, **kw):
         self.transform = kw.pop('transform', ax.transData)
         kw.setdefault('facecolors', self.color)
         kw.setdefault('linewidths', (0,))
-        collections.PolyCollection.__init__(self, [], offsets=self.XY,
+        mcollections.PolyCollection.__init__(self, [], offsets=self.XY,
                                             transOffset=self.transform,
                                             closed=False,
                                             **kw)
@@ -446,7 +446,7 @@ def remove(self):
         self.ax.figure.callbacks.disconnect(self._cid)
         self._cid = None
         # pass the remove call up the stack
-        collections.PolyCollection.remove(self)
+        mcollections.PolyCollection.remove(self)
 
     def _init(self):
         """
@@ -473,7 +473,7 @@ def draw(self, renderer):
             verts = self._make_verts(self.U, self.V)
             self.set_verts(verts, closed=False)
             self._new_UV = False
-        collections.PolyCollection.draw(self, renderer)
+        mcollections.PolyCollection.draw(self, renderer)
 
     def set_UVC(self, U, V, C=None):
         U = ma.masked_invalid(U, copy=False).ravel()
@@ -806,7 +806,7 @@ def _h_arrows(self, length):
 docstring.interpd.update(barbs_doc=_barbs_doc)
 
 
-class Barbs(collections.PolyCollection):
+class Barbs(mcollections.PolyCollection):
     '''
     Specialized PolyCollection for barbs.
 
@@ -867,7 +867,7 @@ def __init__(self, ax, *args, **kw):
 
         #Make a collection
         barb_size = self._length ** 2 / 4  # Empirically determined
-        collections.PolyCollection.__init__(self, [], (barb_size,), offsets=xy,
+        mcollections.PolyCollection.__init__(self, [], (barb_size,), offsets=xy,
                                             transOffset=transform, **kw)
         self.set_transform(transforms.IdentityTransform())
 
@@ -1091,7 +1091,7 @@ def set_offsets(self, xy):
         x, y, u, v = delete_masked_points(self.x.ravel(), self.y.ravel(),
                                           self.u, self.v)
         xy = np.hstack((x[:, np.newaxis], y[:, np.newaxis]))
-        collections.PolyCollection.set_offsets(self, xy)
-    set_offsets.__doc__ = collections.PolyCollection.set_offsets.__doc__
+        mcollections.PolyCollection.set_offsets(self, xy)
+    set_offsets.__doc__ = mcollections.PolyCollection.set_offsets.__doc__
 
     barbs_doc = _barbs_doc
