summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-29 16:13:51 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-29 16:13:51 (GMT)
commitf7d08e85221f7e1dd5c0d7edb7844c99ddeb6469 (patch)
tree8aba48fbaf0b4eee92c8e463676afa3a94671d87 /Doc
parentc7390669141de086909e9c55503d1b54ac8974bf (diff)
parent75e86a678c460f8b2d50c4616402e0ccd879a289 (diff)
downloadcpython-f7d08e85221f7e1dd5c0d7edb7844c99ddeb6469.zip
cpython-f7d08e85221f7e1dd5c0d7edb7844c99ddeb6469.tar.gz
cpython-f7d08e85221f7e1dd5c0d7edb7844c99ddeb6469.tar.bz2
Merge 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/distutils/apiref.rst1
-rw-r--r--Doc/library/pprint.rst6
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 59f7b85..dc5bcf2 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -2006,6 +2006,7 @@ This is described in more detail in :pep:`301`.
.. % todo
+
:mod:`distutils.command.check` --- Check the meta-data of a package
===================================================================
diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst
index fc54208..3a86331 100644
--- a/Doc/library/pprint.rst
+++ b/Doc/library/pprint.rst
@@ -193,7 +193,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
@@ -201,8 +201,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::