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

Sat Nov 3 22:40:19 CET 2012

http://hg.python.org/cpython/rev/bc8e6301cfc2
changeset: 80225:bc8e6301cfc2
parent: 80223:e3f01a6604c8
parent: 80224:95ea024f0569
user: Éric Araujo <merwok at netwok.org>
date: Sat Nov 03 17:40:06 2012 -0400
summary:
 Merge 3.3
files:
 Doc/library/functions.rst | 5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -958,12 +958,13 @@
 ... dir_fd = os.open(dirname, os.O_RDONLY)
 ... def opener(path, flags):
 ... return os.open(path, flags, dir_fd=dir_fd)
- ... return opener
+ ... return opener, dir_fd
 ...
- >>> opener = open_relative('somedir')
+ >>> opener, dir_fd = open_relative('somedir')
 >>> with open('spamspam.txt', 'w', opener=opener) as f:
 ... print('This will be written to somedir/spamspam.txt', file=f)
 ...
+ >>> os.close(dir_fd) # don't leak a file descriptor
 
 .. versionchanged:: 3.3
 The *opener* parameter was added.
-- 
Repository URL: http://hg.python.org/cpython
