[Python-checkins] cpython (merge 3.3 -> default): #17271: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/fcc61327c86c
changeset:   82320:fcc61327c86c
parent:      82316:fb50eb64e097
parent:      82319:a9993d40821f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Feb 22 08:29:34 2013 +0200
summary:
  #17271: merge with 3.3.

files:
  Doc/library/tempfile.rst |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Doc/library/tempfile.rst b/Doc/library/tempfile.rst
--- a/Doc/library/tempfile.rst
+++ b/Doc/library/tempfile.rst
@@ -181,11 +181,10 @@
       ``delete=False`` parameter::
 
          >>> f = NamedTemporaryFile(delete=False)
-         >>> f
-         <open file '<fdopen>', mode 'w+b' at 0x384698>
          >>> f.name
-         '/var/folders/5q/5qTPn6xq2RaWqk+1Ytw3-U+++TI/-Tmp-/tmpG7V1Y0'
-         >>> f.write("Hello World!\n")
+         '/tmp/tmptjujjt'
+         >>> f.write(b"Hello World!\n")
+         13
          >>> f.close()
          >>> os.unlink(f.name)
          >>> os.path.exists(f.name)

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