summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-11-03 21:40:06 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-11-03 21:40:06 (GMT)
commit75e74c65e5d33ab4e43b30be6a7af351c6c15896 (patch)
treee50deff2e1f690a4773ab9f5e0d84f8200b016e9
parentf69a1f301e41cc3758f9bf09d94493acf9bdd169 (diff)
parent309b0432377f2f7159fa4f407859db9d6d5fdc39 (diff)
downloadcpython-75e74c65e5d33ab4e43b30be6a7af351c6c15896.zip
cpython-75e74c65e5d33ab4e43b30be6a7af351c6c15896.tar.gz
cpython-75e74c65e5d33ab4e43b30be6a7af351c6c15896.tar.bz2
Merge 3.3
-rw-r--r--Doc/library/functions.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 5df7b67..5885fe2 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -958,12 +958,13 @@ are always available. They are listed here in alphabetical order.
... 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.