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

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

Revision: 4340
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4340&view=rev
Author:   mdboom
Date:     2007-11-16 09:48:05 -0800 (Fri, 16 Nov 2007)

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

........
  r4331 | mdboom | 2007-11-16 08:46:59 -0500 (Fri, 16 Nov 2007) | 2 lines
  
  Fix numerals in stixsans mode.
........
  r4336 | jdh2358 | 2007-11-16 10:58:05 -0500 (Fri, 16 Nov 2007) | 2 lines
  
  fixed bug in polyfit, polyval deprecation
........

Modified Paths:
--------------
    branches/transforms/lib/matplotlib/_mathtext_data.py
    branches/transforms/lib/matplotlib/mlab.py

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


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

Modified: branches/transforms/lib/matplotlib/_mathtext_data.py
===================================================================
--- branches/transforms/lib/matplotlib/_mathtext_data.py	2007-11-16 17:09:18 UTC (rev 4339)
+++ branches/transforms/lib/matplotlib/_mathtext_data.py	2007-11-16 17:48:05 UTC (rev 4340)
@@ -2432,7 +2432,9 @@
             ],
         'it':
             [
-            (0x0030, 0x0039, 'it', 0xe1b4),  # 0-9
+            # These numerals are actually upright.  We don't actually
+            # want italic numerals ever.
+            (0x0030, 0x0039, 'rm', 0x1d7e2),  # 0-9
             (0x0041, 0x005a, 'it', 0x1d608), # A-Z
             (0x0061, 0x007a, 'it', 0x1d622), # a-z
             (0x0391, 0x03a9, 'it', 0xe1bf),  # \Alpha-\Omega

Modified: branches/transforms/lib/matplotlib/mlab.py
===================================================================
--- branches/transforms/lib/matplotlib/mlab.py	2007-11-16 17:09:18 UTC (rev 4339)
+++ branches/transforms/lib/matplotlib/mlab.py	2007-11-16 17:48:05 UTC (rev 4340)
@@ -442,6 +442,7 @@
     kw = dict(rowvar=False)
     return npy.corrcoef(*args, **kw)
 
+
 def polyfit(*args, **kwargs):
     """
     def polyfit(x,y,N)
@@ -482,7 +483,7 @@
 
     """
     warnings.warn("use numpy.poyfit", DeprecationWarning)
-    return npy.polyfit(*args, **kw)
+    return npy.polyfit(*args, **kwargs)
 
 
 
@@ -504,9 +505,8 @@
 
     """
     warnings.warn("use numpy.polyval", DeprecationWarning)
-    return npy.polyval(*args, **kw)
+    return npy.polyval(*args, **kwargs)
 
-
 def vander(*args, **kwargs):
     """
     X = vander(x,N=None)
@@ -2262,7 +2262,8 @@
         return x
     
 class FormatInt(FormatObj):
-    pass
+    def toval(self, x):
+        return x
 
 class FormatPercent(FormatFloat):
     def __init__(self, precision=4):


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