SF.net SVN: matplotlib:[8067] trunk/matplotlib/lib/matplotlib/axes.py

[<ef...@us...>]

Revision: 8067
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8067&view=rev
Author:   efiring
Date:     2010-01-04 04:30:24 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
Remove unnecessary private method.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010-01-04 02:22:26 UTC (rev 8066)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010-01-04 04:30:24 UTC (rev 8067)
@@ -150,11 +150,8 @@
     def set_color_cycle(self, clist=None):
         if clist is None:
             clist = rcParams['axes.color_cycle']
-        self._colors = itertools.cycle(clist)
+        self.color_cycle = itertools.cycle(clist)
 
-    def _get_next_cycle_color(self):
-        return self._colors.next()
-
     def __call__(self, *args, **kwargs):
 
         if self.axes.xaxis is not None and self.axes.yaxis is not None:
@@ -225,7 +222,7 @@
     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 @@
         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 @@
 
         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 @@
 
             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 @@
                     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 @@
                 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) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.