exposed default color cycle

jdh2358 · jdh2358 · commit 1796fe661f08 · 2007-12-05T15:16:48.000Z
svn path=/trunk/matplotlib/; revision=4614
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,5 @@
+    Removed, dead/experimental ExampleInfo, Namespace and Importer
+    code from matplotlib/__init__.py
 0.91.1 Released
 
 0.91.0 Released
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -55,7 +55,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.91.1'
+__version__  = '0.91.2svn'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
@@ -784,60 +784,3 @@ def tk_window_focus():
 verbose.report('platform is %s'%sys.platform)
 verbose.report('loaded modules: %s'%sys.modules.keys(), 'debug')
 
-class ExampleInfo:
-    pass
-
-class ExampleManager:
-    baseurl = 'http://matplotlib.sf.net'
-    urls = ['%s/%s'%(baseurl, subdir) for subdir in
-            ( 'examples', 'examples/widgets')]
-
-    def get_examples(self):
-        import urllib, re
-        rgx = re.compile('.*<A HREF="([^.]+\.py)">.*')
-        examples = []
-        for url in urls:
-            lines = urllib.urlopen(url).readlines()
-            for line in lines:
-                m = rgx.match(line)
-                if m is not None:
-                    examples.append('%s/%s'%(url, m.group(1)))
-        return examples
-
-    def get_info(self, s):
-        """
-        return an ExampleInfo instance from s, the string content of
-        an example
-        """
-        pass
-
-class Namespace:
-    """
-    A class which takes a list of modules and creates an object with
-    the module naems at attrs
-    """
-    def __init__(self, namespace):
-        for k,v in namespace.items():
-            modname = getattr(v, '__name__', None)
-            if modname is None: continue
-            if modname.startswith('matplotlib.'):
-                self.__dict__[modname.replace('matplotlib.', '')] = v
-
-
-class Importer:
-    def __init__(self, modstr):
-        """
-        import a bunch of matplotlib modules listed in modstr into a
-        single namespace.  Eg,
-
-        mpl = Importer('artist, cbook, lines, patches')
-        print mpl.cbook.iterable(1)
-        """
-        for name in modstr.split(','):
-            name = name.strip()
-            wholename = '.'.join(['matplotlib', name])
-            basemod = __import__(wholename)
-            mod = getattr(basemod, name)
-            setattr(self, name, mod)
-
-
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -152,13 +152,14 @@ class _process_plot_var_args:
     an arbitrary number of x, y, fmt are allowed
     """
 
+    defaultColors = ['b','g','r','c','m','y','k']
     def __init__(self, axes, command='plot'):
         self.axes = axes
         self.command = command
         self._clear_color_cycle()
 
     def _clear_color_cycle(self):
-        self.colors = ['b','g','r','c','m','y','k']
+        self.colors = _process_plot_var_args.defaultColors[:]
         # if the default line color is a color format string, move it up
         # in the que
         try: ind = self.colors.index(rcParams['lines.color'])
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -243,6 +243,8 @@ def set_array(self, A):
 
         self.set_data(A)
 
+
+
     def set_extent(self, extent):
         """extent is data axes (left, right, bottom, top) for making image plots
         """
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -25,7 +25,7 @@
 
 #### CONFIGURATION BEGINS HERE
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
-#     Agg Cairo GD GDK Paint PS PDF SVG Template
+# WX WXAgg Agg Cairo GD GDK Paint PS PDF SVG Template
 backend      : %(backend)s
 numerix      : %(numerix)s  # numpy, Numeric or numarray
 #maskedarray : False       # True to use external maskedarray module

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+ Removed, dead/experimental ExampleInfo, Namespace and Importer`
	`2`	`+ code from matplotlib/__init__.py`
`1`	`3`	`0.91.1 Released`
`2`	`4`
`3`	`5`	`0.91.0 Released`