From: Éric Araujo <merwok@netwok.org>
Date: Sat, 3 Nov 2012 21:39:45 +0000 (-0400)
Subject: Avoid fd leak in example.  Caught by Serhiy.
X-Git-Tag: v3.3.1rc1~688
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=309b0432377f2f7159fa4f407859db9d6d5fdc39;p=thirdparty%2FPython%2Fcpython.git

Avoid fd leak in example.  Caught by Serhiy.
---

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 5df7b6705b21..5885fe291876 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.