[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

Sat Sep 29 21:03:28 CEST 2012

http://hg.python.org/cpython/rev/f09bc2555e83
changeset: 79275:f09bc2555e83
branch: 2.7
parent: 79274:53e91fa35f8e
parent: 79265:a6779524962c
user: Gregory P. Smith <greg at krypto.org>
date: Sat Sep 29 12:03:12 2012 -0700
summary:
 merge heads
files:
 Doc/library/configparser.rst | 14 +++++++-------
 Doc/library/functions.rst | 2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -451,9 +451,9 @@
 # when attempting to write to a file or when you get it in non-raw
 # mode. SafeConfigParser does not allow such assignments to take place.
 config.add_section('Section1')
- config.set('Section1', 'int', '15')
- config.set('Section1', 'bool', 'true')
- config.set('Section1', 'float', '3.1415')
+ config.set('Section1', 'an_int', '15')
+ config.set('Section1', 'a_bool', 'true')
+ config.set('Section1', 'a_float', '3.1415')
 config.set('Section1', 'baz', 'fun')
 config.set('Section1', 'bar', 'Python')
 config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -471,13 +471,13 @@
 
 # getfloat() raises an exception if the value is not a float
 # getint() and getboolean() also do this for their respective types
- float = config.getfloat('Section1', 'float')
- int = config.getint('Section1', 'int')
- print float + int
+ a_float = config.getfloat('Section1', 'a_float')
+ an_int = config.getint('Section1', 'an_int')
+ print a_float + an_int
 
 # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
 # This is because we are using a RawConfigParser().
- if config.getboolean('Section1', 'bool'):
+ if config.getboolean('Section1', 'a_bool'):
 print config.get('Section1', 'foo')
 
 To get interpolation, you will need to use a :class:`ConfigParser` or
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1100,7 +1100,7 @@
 except StopIteration:
 raise TypeError('reduce() of empty sequence with no initial value')
 accum_value = initializer
- for x in iterable:
+ for x in it:
 accum_value = function(accum_value, x)
 return accum_value
 
-- 
Repository URL: http://hg.python.org/cpython
