From: Éric Araujo <merwok@netwok.org>
Date: Fri, 25 Feb 2011 21:46:00 +0000 (+0000)
Subject: Merged revisions 88613 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=682f6a7a1cabcb9fb544f925c88a40d75f0b7b0d;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 88613 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88613 | eric.araujo | 2011-02-25 22:40:34 +0100 (ven., 25 févr. 2011) | 2 lines

  Add missing read() in distutils doc.
........
---

diff --git a/Doc/distutils/uploading.rst b/Doc/distutils/uploading.rst
index 7b790b1e026b..fd0c50873cb9 100644
--- a/Doc/distutils/uploading.rst
+++ b/Doc/distutils/uploading.rst
@@ -57,8 +57,11 @@ in the package::
 
     from distutils.core import setup
 
+    with open('README.txt') as file:
+        long_description = file.read()
+
     setup(name='Distutils',
-          long_description=open('README.txt'))
+          long_description=long_description)
 
 In that case, :file:`README.txt` is a regular reStructuredText text file located
 in the root of the package besides :file:`setup.py`.