Merged revisions 62954-62959,62961,62963-62967,62969-62970,62972-62973,62975-62976,62978-62982,62984,62987-62996 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62954 | martin.v.loewis | 2008-05-09 16:11:37 -0400 (Fri, 09 May 2008) | 1 line
Port to VS 2008. Drop W9x support.
........
r62957 | benjamin.peterson | 2008-05-09 17:30:26 -0400 (Fri, 09 May 2008) | 2 lines
In stdtypes.rst, move methods under class directives where applicable
........
r62958 | brett.cannon | 2008-05-09 17:30:36 -0400 (Fri, 09 May 2008) | 2 lines
Add a todo list to the module deletion command.
........
r62963 | brett.cannon | 2008-05-09 18:52:28 -0400 (Fri, 09 May 2008) | 2 lines
Add support for extension modules in 3.0 deprection command.
........
r62967 | brett.cannon | 2008-05-09 22:25:00 -0400 (Fri, 09 May 2008) | 2 lines
Fix some errors in the deprecation warnings for new and user.
........
r62975 | brett.cannon | 2008-05-09 22:54:52 -0400 (Fri, 09 May 2008) | 3 lines
Suppress deprecations for packages as well when using
test.test_support.import_module().
........
r62976 | brett.cannon | 2008-05-09 22:57:03 -0400 (Fri, 09 May 2008) | 2 lines
Also ignore package deprecations.
........
r62982 | benjamin.peterson | 2008-05-09 23:08:17 -0400 (Fri, 09 May 2008) | 2 lines
Add the examples in the json module docstring as a doctest
........
r62992 | martin.v.loewis | 2008-05-10 09:24:09 -0400 (Sat, 10 May 2008) | 2 lines
Explicitly refer to current hhp file (2.6a3)
........
r62993 | skip.montanaro | 2008-05-10 10:48:49 -0400 (Sat, 10 May 2008) | 2 lines
Note the PyPI-edness of bsddb185 for people who might still need it.
........
r62994 | andrew.kuchling | 2008-05-10 13:36:24 -0400 (Sat, 10 May 2008) | 1 line
Docstring typo
........
r62995 | andrew.kuchling | 2008-05-10 13:37:05 -0400 (Sat, 10 May 2008) | 1 line
Document the 'line' argument
........
r62996 | andrew.kuchling | 2008-05-10 13:48:45 -0400 (Sat, 10 May 2008) | 1 line
#1625509: describe behaviour of import lock
........
diff --git a/Lib/site.py b/Lib/site.py
index 548aa62..0df1d04 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -184,7 +184,7 @@
def check_enableusersite():
"""Check if user site directory is safe for inclusion
- The functions tests for the command line flag (including environment var),
+ The function tests for the command line flag (including environment var),
process uid/gid equal to effective uid/gid.
None: Disabled for security reasons