summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-29 15:56:20 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-29 15:56:20 (GMT)
commite4427bf9c9ff096ab10589b7aba1e2a6f9c3093f (patch)
treeb0927965c569c48629d50baa4b2d6915956ff56b /Doc/library
parentd5a91961dd0e501a448ec3a048146132121c24c6 (diff)
parent87418afb3b6c6ef220df439004501093609abb2e (diff)
downloadcpython-e4427bf9c9ff096ab10589b7aba1e2a6f9c3093f.zip
cpython-e4427bf9c9ff096ab10589b7aba1e2a6f9c3093f.tar.gz
cpython-e4427bf9c9ff096ab10589b7aba1e2a6f9c3093f.tar.bz2
Branch merge
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/functions.rst2
-rw-r--r--Doc/library/pprint.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 1547f6d..42f2bc9 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -527,7 +527,7 @@ are always available. They are listed here in alphabetical order.
Two objects with non-overlapping lifetimes may have the same :func:`id`
value.
- .. impl-detail:: This is the address of the object.
+ .. impl-detail:: This is the address of the object in memory.
.. function:: input([prompt])
diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst
index 7bebd8c..4169b64 100644
--- a/Doc/library/pprint.rst
+++ b/Doc/library/pprint.rst
@@ -192,7 +192,7 @@ Example
-------
To demonstrate several uses of the :func:`pprint` function and its parameters,
-let's fetch information about a package from PyPI::
+let's fetch information about a project from PyPI::
>>> import json
>>> import pprint
@@ -200,8 +200,8 @@ let's fetch information about a package from PyPI::
>>> with urlopen('http://pypi.python.org/pypi/configparser/json') as url:
... http_info = url.info()
... raw_data = url.read().decode(http_info.get_content_charset())
- >>> package_data = json.loads(raw_data)
- >>> result = {'headers': http_info.items(), 'body': package_data}
+ >>> project_info = json.loads(raw_data)
+ >>> result = {'headers': http_info.items(), 'body': project_info}
In its basic form, :func:`pprint` shows the whole object::