[Python-checkins] cpython (merge default -> default): Branch merge
eric.araujo
python-checkins at python.org
Sun Jun 24 19:54:31 CEST 2012
http://hg.python.org/cpython/rev/64f5d7674241
changeset: 77734:64f5d7674241
parent: 77730:75b818d7c50d
parent: 77733:dd7623a1e9a5
user: Éric Araujo <merwok at netwok.org>
date: Sun Jun 24 13:54:22 2012 -0400
summary:
Branch merge
files:
Doc/library/os.rst | 6 +++---
Doc/library/shutil.rst | 2 +-
Lib/test/test_venv.py | 4 ++++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1205,7 +1205,7 @@
* For some functions, the *path* argument can be not only a string giving a path
name, but also a file descriptor. The function will then operate on the file
referred to by the descriptor. (For POSIX systems, this will use the ``f...``
- versions of the function.)
+ version of the function.)
You can check whether or not *path* can be specified as a file descriptor on
your platform using :data:`os.supports_fd`. If it is unavailable, using it
@@ -1220,7 +1220,7 @@
should be a file descriptor referring to a directory, and the path to operate
on should be relative; path will then be relative to that directory. If the
path is absolute, *dir_fd* is ignored. (For POSIX systems, this will use the
- ``f...at`` versions of the function.)
+ ``f...at`` version of the function.)
You can check whether or not *dir_fd* is supported on your platform using
:data:`os.supports_dir_fd`. If it is unavailable, using it will raise a
@@ -1231,7 +1231,7 @@
* For functions ith a *follow_symlinks* parameter: If *follow_symlinks* is
``False``, and the last element of the path to operate on is a symbolic link,
the function will operate on the symbolic link itself instead of the file the
- link points to. (For POSIX systems, this will use the ``l...`` versions of
+ link points to. (For POSIX systems, this will use the ``l...`` version of
the function.)
You can check whether or not *follow_symlinks* is supported on your platform
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -214,7 +214,7 @@
Added a symlink attack resistant version that is used automatically
if platform supports fd-based functions.
- .. data:: rmtree.avoids_symlink_attacks
+ .. attribute:: rmtree.avoids_symlink_attacks
Indicates whether the current platform and implementation provides a
symlink attack resistant version of :func:`rmtree`. Currently this is
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -21,10 +21,12 @@
self.env_dir = tempfile.mkdtemp()
if os.name == 'nt':
self.bindir = 'Scripts'
+ self.pydocname = 'pydoc.py'
self.lib = ('Lib',)
self.include = 'Include'
else:
self.bindir = 'bin'
+ self.pydocname = 'pydoc'
self.lib = ('lib', 'python%s' % sys.version[:3])
self.include = 'include'
if sys.platform == 'darwin' and '__PYTHONV_LAUNCHER__' in os.environ:
@@ -74,6 +76,8 @@
executable = sys.executable
path = os.path.dirname(executable)
self.assertIn('home = %s' % path, data)
+ data = self.get_text_file_contents(self.bindir, self.pydocname)
+ self.assertTrue(data.startswith('#!%s%s' % (self.env_dir, os.sep)))
fn = self.get_env_file(self.bindir, self.exe)
if not os.path.exists(fn): # diagnostics for Windows buildbot failures
bd = self.get_env_file(self.bindir)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list