some more trickery in the Namespace class to aboid duplication of mod names

jdh2358 · jdh2358 · commit 55fa04729b56 · 2007-07-14T13:43:38.000Z
svn path=/trunk/matplotlib/; revision=3525
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -878,7 +878,12 @@ class Namespace:
     A class which takes a list of modules and creates an object with
     the module naems at attrs
     """
-    def __init__(self, *modules):
-	def make_key(x): return x.__name__.replace('matplotlib.', '')
-        self.__dict__ = dict([(make_key(m), m) for m in modules])
+    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
+
+
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -12,9 +12,10 @@
      contour, dates, font_manager, image, legend, lines, mlab, cm, \
      patches, quiver, table, text, ticker, transforms
 
-mpl = matplotlib.Namespace(artist, agg, axis, cbook, collections, colors,
-     contour, dates, font_manager, image, legend, lines, mlab, cm,
-     patches, quiver, table, text, ticker, transforms )
+# put all the matplotlib modules in the local namespace into a single
+# namespace object to avoid ambiguity in references below, eg artist
+# becomes mpl.artist
+mpl = matplotlib.Namespace(locals())
 
 
 def delete_masked_points(*args):
