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

Sun Apr 10 09:41:48 CEST 2011

http://hg.python.org/cpython/rev/655c8849937f
changeset: 69233:655c8849937f
parent: 69231:b6fe63c914e4
parent: 69232:87d89f767b23
user: Ross Lagerwall <rosslagerwall at gmail.com>
date: Sun Apr 10 09:34:35 2011 +0200
summary:
 Merge with 3.2
files:
 Doc/library/tempfile.rst | 10 +++++-----
 Misc/NEWS | 5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst
--- a/Doc/library/tempfile.rst
+++ b/Doc/library/tempfile.rst
@@ -242,26 +242,26 @@
 
 # create a temporary file and write some data to it
 >>> fp = tempfile.TemporaryFile()
- >>> fp.write('Hello world!')
+ >>> fp.write(b'Hello world!')
 # read data from file
 >>> fp.seek(0)
 >>> fp.read()
- 'Hello world!'
+ b'Hello world!'
 # close the file, it will be removed
 >>> fp.close()
 
 # create a temporary file using a context manager
 >>> with tempfile.TemporaryFile() as fp:
- ... fp.write('Hello world!')
+ ... fp.write(b'Hello world!')
 ... fp.seek(0)
 ... fp.read()
- 'Hello world!'
+ b'Hello world!'
 >>>
 # file is now closed and removed
 
 # create a temporary directory using the context manager
 >>> with tempfile.TemporaryDirectory() as tmpdirname:
- ... print 'created temporary directory', tmpdirname
+ ... print('created temporary directory', tmpdirname)
 >>>
 # directory and contents have been removed
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -466,6 +466,11 @@
 
 - PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with Mercurial.
 
+Documentation
+-------------
+
+- Issue #11818: Fix tempfile examples for Python 3.
+
 
 What's New in Python 3.2?
 =========================
-- 
Repository URL: http://hg.python.org/cpython
