SF.net SVN: matplotlib: [4406] branches/transforms

[<md...@us...>]

Revision: 4406
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4406&view=rev
Author:   mdboom
Date:     2007-11-21 08:25:31 -0800 (Wed, 21 Nov 2007)

Log Message:
-----------
Merged revisions 4401-4405 via svnmerge from 
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib

........
  r4402 | mdboom | 2007-11-21 10:24:22 -0500 (Wed, 21 Nov 2007) | 2 lines
  
  Fix to work on Python 2.3
........
  r4404 | mdboom | 2007-11-21 11:05:18 -0500 (Wed, 21 Nov 2007) | 5 lines
  
  Fix memory leak when using colorbar as discovered by Darren Dale.  The
  (unit change) callbacks in the Axis objects were not cleared by cla(),
  so they would continue to grow long lists of callbacks that reference
  entire Axes objects.
........
  r4405 | mdboom | 2007-11-21 11:18:52 -0500 (Wed, 21 Nov 2007) | 2 lines
  
  Fix mathtext bug.
........

Modified Paths:
--------------
    branches/transforms/lib/matplotlib/axis.py
    branches/transforms/lib/matplotlib/mathtext.py
    branches/transforms/lib/matplotlib/pyparsing.py

Property Changed:
----------------
    branches/transforms/


Property changes on: branches/transforms
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/matplotlib:1-4400
   + /trunk/matplotlib:1-4405

Modified: branches/transforms/lib/matplotlib/axis.py
===================================================================
--- branches/transforms/lib/matplotlib/axis.py	2007-11-21 16:18:52 UTC (rev 4405)
+++ branches/transforms/lib/matplotlib/axis.py	2007-11-21 16:25:31 UTC (rev 4406)
@@ -526,6 +526,9 @@
         self.set_minor_locator(NullLocator())
         self.set_minor_formatter(NullFormatter())
 
+        # Clear the callback registry for this axis, or it may "leak"
+        self.callbacks = CallbackRegistry(('units', 'units finalize'))
+
         # whether the grids are on
         self._gridOnMajor = rcParams['axes.grid']
         self._gridOnMinor = False

Modified: branches/transforms/lib/matplotlib/mathtext.py
===================================================================
--- branches/transforms/lib/matplotlib/mathtext.py	2007-11-21 16:18:52 UTC (rev 4405)
+++ branches/transforms/lib/matplotlib/mathtext.py	2007-11-21 16:25:31 UTC (rev 4406)
@@ -2077,9 +2077,9 @@
                        | placeable
                      )
 
-        ambiDelim    = oneOf(self._ambiDelim)
-        leftDelim    = oneOf(self._leftDelim)
-        rightDelim   = oneOf(self._rightDelim)
+        ambiDelim    = oneOf(list(self._ambiDelim))
+        leftDelim    = oneOf(list(self._leftDelim))
+        rightDelim   = oneOf(list(self._rightDelim))
         autoDelim   <<(Suppress(Literal(r"\left"))
                      + ((leftDelim | ambiDelim) | Error("Expected a delimiter"))
                      + Group(

Modified: branches/transforms/lib/matplotlib/pyparsing.py
===================================================================
--- branches/transforms/lib/matplotlib/pyparsing.py	2007-11-21 16:18:52 UTC (rev 4405)
+++ branches/transforms/lib/matplotlib/pyparsing.py	2007-11-21 16:25:31 UTC (rev 4406)
@@ -2846,7 +2846,11 @@
         warnings.warn("Invalid argument to oneOf, expected string or list",
                 SyntaxWarning, stacklevel=2)
 
-    symbols.sort(reverse=True)
+    try:
+        symbols.sort(reverse=True)
+    except TypeError:
+        symbols.sort()
+        symbols.reverse()
     i = 0
     while i < len(symbols)-1:
         cur = symbols[i]


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