[Python-checkins] cpython (2.7): #16085: Don't promote shadowing builtins in the configparser example.

Sat Sep 29 20:44:40 CEST 2012

http://hg.python.org/cpython/rev/1ee270d522f3
changeset: 79264:1ee270d522f3
branch: 2.7
parent: 79227:bff269ee7288
user: R David Murray <rdmurray at bitdance.com>
date: Sat Sep 29 14:44:16 2012 -0400
summary:
 #16085: Don't promote shadowing builtins in the configparser example.
files:
 Doc/library/configparser.rst | 14 +++++++-------
 1 files changed, 7 insertions(+), 7 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
-- 
Repository URL: http://hg.python.org/cpython
