SF.net SVN: matplotlib: [4745] trunk/matplotlib/lib/matplotlib

[<jd...@us...>]

Revision: 4745
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4745&view=rev
Author:   jdh2358
Date:     2007-12-15 13:33:38 -0800 (Sat, 15 Dec 2007)

Log Message:
-----------
changed %g to %r for rec2csv

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/mlab.py
    trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2007-12-15 20:27:51 UTC (rev 4744)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2007-12-15 21:33:38 UTC (rev 4745)
@@ -2233,12 +2233,12 @@
         return self.toval(x)
 
     def toval(self, x):
-        return str(x)
+        return repr(x)
 
 
 class FormatString(FormatObj):
     def tostr(self, x):
-        return '"%s"'%self.toval(x)
+        return '"%r"'%self.toval(x)
 
 
 class FormatFormatStr(FormatObj):
@@ -2317,7 +2317,7 @@
     format = copy.deepcopy(format)
     if isinstance(format, FormatFloat):
         format.scale = 1. # override scaling for storage
-        format.fmt = '%g' # maximal precision
+        format.fmt = '%r'
     return format
 
 def rec2csv(r, fname, delimiter=',', formatd=None):

Modified: trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template
===================================================================
--- trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template	2007-12-15 20:27:51 UTC (rev 4744)
+++ trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template	2007-12-15 21:33:38 UTC (rev 4745)
@@ -3,32 +3,32 @@
 # This is a sample matplotlib configuration file.  It should be placed
 # in HOME/.matplotlib/matplotlibrc (unix/linux like systems) and
 # C:\Documents and Settings\yourname\.matplotlib (win32 systems)
-# 
+#
 # By default, the installer will overwrite the existing file in the install
 # path, so if you want to preserve yours, please move it to your HOME dir and
 # set the environment variable if necessary.
-# 
+#
 # This file is best viewed in a editor which supports ini or conf mode syntax
 # highlighting.
-# 
+#
 # Blank lines, or lines starting with a comment symbol, are ignored,
 # as are trailing comments.  Other lines must have the format
-# 
+#
 #   key = val   optional comment
-# 
+#
 # val should be valid python syntax, just as you would use when setting
 # properties using rcParams. This should become more obvious by inspecting
 # the default values listed herein.
-# 
+#
 # Colors: for the color values below, you can either use
 #  - a matplotlib color string, such as r | k | b
 #  - an rgb tuple, such as (1.0, 0.5, 0.0)
 #  - a hex string, such as #ff00ff or ff00ff
 #  - a scalar grayscale intensity such as 0.75
 #  - a legal html color name, eg red | blue | darkslategray
-# 
+#
 # Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
-# 
+#
 # ### CONFIGURATION BEGINS HERE ###
 
 # a value of type 'str'
@@ -42,7 +42,7 @@
 # 'Africa/Abidjan' or 'Africa/Accra' or 'Africa/Addis_Ababa' or
 # 'Africa/Algiers' or 'Africa/Asmara' or 'Africa/Asmera' or 'Africa/Bamako' or
 # 'Africa/Bangui' or 'Africa/Banjul' or 'Africa/Bissau' or 'Africa/Blantyre'
-#  <...snipped 156 lines...> 
+#  <...snipped 156 lines...>
 # 'US/Michigan' or 'US/Mountain' or 'US/Pacific' or 'US/Pacific-New' or
 # 'US/Samoa' or 'UTC' or 'Universal' or 'W-SU' or 'WET' or 'Zulu' or
 # 'posixrules'
@@ -108,10 +108,10 @@
     [[ps]]
         # 3 or 42
         fonttype = 3
-        # 'auto' or 'letter' or 'legal' or 'ledger' or 'A0' or 'A1' or 'A2' or
-        # 'A3' or 'A4' or 'A5' or 'A6' or 'A7' or 'A8' or 'A9' or 'A10' or
-        # 'B0' or 'B1' or 'B2' or 'B3' or 'B4' or 'B5' or 'B6' or 'B7' or 'B8'
-        # or 'B9' or 'B10'
+        # auto | letter | legal | ledger | A0 | A1 | A2 |
+        # A3 | A4 | A5 | A6 | A7 | A8 | A9 | A10 |
+        # B0 | B1 | B2 | B3 | B4 | B5 | B6 | B7 | B8
+        # | B9 | B10
         papersize = 'letter'
         # a value of type 'bool'
         useafm = False
@@ -216,7 +216,7 @@
     # 'Accent' or 'Accent_r' or 'Blues' or 'Blues_r' or 'BrBG' or 'BrBG_r' or
     # 'BuGn' or 'BuGn_r' or 'BuPu' or 'BuPu_r' or 'Dark2' or 'Dark2_r' or
     # 'GnBu' or 'GnBu_r' or 'Greens' or 'Greens_r' or 'Greys' or 'Greys_r' or
-    #  <...snipped 16 lines...> 
+    #  <...snipped 16 lines...>
     # 'pink_r' or 'prism' or 'prism_r' or 'spectral' or 'spectral_r' or
     # 'spring' or 'spring_r' or 'summer' or 'summer_r' or 'winter' or
     # 'winter_r'
@@ -404,4 +404,4 @@
         # a value of type 'float'
         pad = 4.0
         # a value of type 'float'
-        size = 2.0
\ No newline at end of file
+        size = 2.0


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