[Python-checkins] cpython (merge 3.1 -> 3.2): Merge 3.1

[eric.araujo]

http://hg.python.org/cpython/rev/f290cba000ec
changeset:   70496:f290cba000ec
branch:      3.2
parent:      70495:8638456eb110
parent:      70494:dba9d9dea06c
user:        Éric Araujo <merwok at netwok.org>
date:        Sun May 29 18:07:12 2011 +0200
summary:
  Merge 3.1

files:
  Doc/library/pprint.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst
--- a/Doc/library/pprint.rst
+++ b/Doc/library/pprint.rst
@@ -193,7 +193,7 @@
 -------
 
 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 @@
    >>> 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::
 

-- 
Repository URL: http://hg.python.org/cpython