Remove unnecessary private method.

efiring · efiring · commit ca66d1142578 · 2010-01-04T04:30:24.000Z
svn path=/trunk/matplotlib/; revision=8067
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -150,10 +150,7 @@ def __init__(self, axes, command='plot'):
     def set_color_cycle(self, clist=None):
         if clist is None:
             clist = rcParams['axes.color_cycle']
-        self._colors = itertools.cycle(clist)
-
-    def _get_next_cycle_color(self):
-        return self._colors.next()
+        self.color_cycle = itertools.cycle(clist)
 
     def __call__(self, *args, **kwargs):
 
@@ -225,7 +222,7 @@ def _xy_from_xy(self, x, y):
     def _makeline(self, x, y, kw, kwargs):
         kw = kw.copy() # Don't modify the original kw.
         if not 'color' in kw:
-            kw['color'] = self._get_next_cycle_color()
+            kw['color'] = self.color_cycle.next()
             # (can't use setdefault because it always evaluates
             # its second argument)
         seg = mlines.Line2D(x, y,
@@ -239,7 +236,7 @@ def _makefill(self, x, y, kw, kwargs):
         try:
             facecolor = kw['color']
         except KeyError:
-            facecolor = self._get_next_cycle_color()
+            facecolor = self.color_cycle.next()
         seg = mpatches.Polygon(np.hstack(
                                 (x[:,np.newaxis],y[:,np.newaxis])),
                       facecolor = facecolor,
@@ -4866,7 +4863,7 @@ def xywhere(xs, ys, mask):
 
         if ecolor is None:
             if l0 is None:
-                ecolor = self._get_lines._get_next_cycle_color()
+                ecolor = self._get_lines.color_cycle.next()
             else:
                 ecolor = l0.get_color()
 
@@ -7163,7 +7160,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
 
             if orientation == 'horizontal':
                 for m in n:
-                    color = self._get_lines._get_next_cycle_color()
+                    color = self._get_lines.color_cycle.next()
                     patch = self.barh(bins[:-1]+boffset, m, height=width,
                                       left=bottom, align='center', log=log,
                                       color=color)
@@ -7174,7 +7171,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                     boffset += dw
             elif orientation == 'vertical':
                 for m in n:
-                    color = self._get_lines._get_next_cycle_color()
+                    color = self._get_lines.color_cycle.next()
                     patch = self.bar(bins[:-1]+boffset, m, width=width,
                                      bottom=bottom, align='center', log=log,
                                      color=color)
@@ -7219,7 +7216,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 elif orientation != 'vertical':
                     raise ValueError, 'invalid orientation: %s' % orientation
 
-                color = self._get_lines._get_next_cycle_color()
+                color = self._get_lines.color_cycle.next()
                 if fill:
                     patches.append( self.fill(x, y,
                         closed=False, facecolor=color) )
