SF.net SVN: matplotlib: [3923] trunk/matplotlib

[<ds...@us...>]

Revision: 3923
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3923&view=rev
Author:   dsdale
Date:     2007-10-05 11:56:10 -0700 (Fri, 05 Oct 2007)

Log Message:
-----------
remove generator expressions from texmanager and mpltraits

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/config/mpltraits.py
    trunk/matplotlib/lib/matplotlib/texmanager.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2007-10-05 18:30:39 UTC (rev 3922)
+++ trunk/matplotlib/CHANGELOG	2007-10-05 18:56:10 UTC (rev 3923)
@@ -1,3 +1,6 @@
+2007-10-05 remove generator expressions from texmanager and mpltraits. 
+           generator expressions are not supported by python-2.3 - DSD
+
 2007-10-01 Made matplotlib.use() raise an exception if called after
            backends has been imported.
 

Modified: trunk/matplotlib/lib/matplotlib/config/mpltraits.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mpltraits.py	2007-10-05 18:30:39 UTC (rev 3922)
+++ trunk/matplotlib/lib/matplotlib/config/mpltraits.py	2007-10-05 18:56:10 UTC (rev 3923)
@@ -46,7 +46,7 @@
     def info(self):
         be = self.backends.keys()
         be.sort
-        return "one of %s"% ', '.join('%s'%i for i in be)
+        return "one of %s"% ', '.join(['%s'%i for i in be])
 
 
 class BoolHandler(T.TraitHandler):
@@ -73,7 +73,7 @@
             return self.error(object, name, value)
 
     def info(self):
-        return "one of %s"% ', '.join('%s'%i for i in self.bools.keys())
+        return "one of %s"% ', '.join(['%s'%i for i in self.bools.keys()])
 
 flexible_true = T.Trait(True, BoolHandler())
 flexible_false = T.Trait(False, BoolHandler())

Modified: trunk/matplotlib/lib/matplotlib/texmanager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/texmanager.py	2007-10-05 18:30:39 UTC (rev 3922)
+++ trunk/matplotlib/lib/matplotlib/texmanager.py	2007-10-05 18:56:10 UTC (rev 3923)
@@ -110,7 +110,7 @@
 
     _rc_cache = None
     _rc_cache_keys = ('text.latex.preamble', )\
-                     + tuple('font.'+n for n in ('family', ) + font_families)
+                     + tuple(['font.'+n for n in ('family', ) + font_families])
 
     def __init__(self):
 
@@ -125,7 +125,7 @@
 
         fontconfig = [self.font_family]
         for font_family, font_family_attr in \
-            ((ff, ff.replace('-', '_')) for ff in self.font_families):
+            [(ff, ff.replace('-', '_')) for ff in self.font_families]:
             for font in rcParams['font.'+font_family]:
                 if font.lower() in self.font_info:
                     found_font = self.font_info[font.lower()]
@@ -163,7 +163,7 @@
     def get_font_config(self):
         "Reinitializes self if rcParams self depends on have changed."
         if self._rc_cache is None:
-            self._rc_cache = dict((k,None) for k in self._rc_cache_keys)
+            self._rc_cache = dict([(k,None) for k in self._rc_cache_keys])
         changed = [par for par in self._rc_cache_keys if rcParams[par] != \
                    self._rc_cache[par]]
         if changed:


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