[Python-checkins] r74405 - in python/branches/py3k: Doc/tutorial/stdlib2.rst

Thu Aug 13 14:06:44 CEST 2009

Author: georg.brandl
Date: Thu Aug 13 14:06:43 2009
New Revision: 74405
Log:
Merged revisions 74404 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r74404 | georg.brandl | 2009年08月13日 14:05:52 +0200 (Do, 13 Aug 2009) | 1 line
 
 Use locale.format_string() for more than one specifier.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/tutorial/stdlib2.rst
Modified: python/branches/py3k/Doc/tutorial/stdlib2.rst
==============================================================================

--- python/branches/py3k/Doc/tutorial/stdlib2.rst	(original)
+++ python/branches/py3k/Doc/tutorial/stdlib2.rst	Thu Aug 13 14:06:43 2009
@@ -61,8 +61,8 @@
 >>> x = 1234567.8
 >>> locale.format("%d", x, grouping=True)
 '1,234,567'
- >>> locale.format("%s%.*f", (conv['currency_symbol'],
- ... conv['frac_digits'], x), grouping=True)
+ >>> locale.format_string("%s%.*f", (conv['currency_symbol'],
+ ... conv['frac_digits'], x), grouping=True)
 '1,234,567ドル.80'
 
 
