Implemented PEP 370
diff --git a/Doc/library/site.rst b/Doc/library/site.rst
index 4e54900..ff70aff 100644
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -85,3 +85,51 @@
empty, and the path manipulations are skipped; however the import of
:mod:`sitecustomize` is still attempted.
+
+.. data:: PREFIXES
+
+ A list of prefixes for site package directories
+
+ .. versionadded:: 2.6
+
+
+.. data:: ENABLE_USER_SITE
+
+ Flag showing the status of the user site directory. True means the
+ user site directory is enabled and added to sys.path. When the flag
+ is None the user site directory is disabled for security reasons.
+
+ .. versionadded:: 2.6
+
+
+.. data:: USER_SITE
+
+ Path to the user site directory for the current Python version or None
+
+ .. versionadded:: 2.6
+
+
+.. data:: USER_BASE
+
+ Path to the base directory for user site directories
+
+ .. versionadded:: 2.6
+
+
+.. envvar:: PYTHONNOUSERSITE
+
+ .. versionadded:: 2.6
+
+
+.. envvar:: PYTHONUSERBASE
+
+ .. versionadded:: 2.6
+
+
+.. function:: addsitedir(sitedir, known_paths=None)
+
+ Adds a directory to sys.path and processes its pth files.
+
+
+XXX Update documentation
+XXX document python -m site --user-base --user-site
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 355e9ed..a6ab7ad 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -21,7 +21,7 @@
When invoking Python, you may specify any of these options::
- python [-dEiOQStuUvxX3?] [-c command | -m module-name | script | - ] [args]
+ python [-dEiOQsStuUvxX3?] [-c command | -m module-name | script | - ] [args]
The most common use case is, of course, a simple invocation of a script::
@@ -240,6 +240,17 @@
:pep:`238` -- Changing the division operator
+.. cmdoption:: -s
+
+ Don't add user site directory to sys.path
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
.. cmdoption:: -S
Disable the import of the module :mod:`site` and the site-dependent
@@ -471,6 +482,28 @@
.. versionadded:: 2.6
+.. envvar:: PYTHONNOUSERSITE
+
+ If this is set, Python won't add the user site directory to sys.path
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
+.. envvar:: PYTHONUSERBASE
+
+ Sets the base directory for the user site directory
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
.. envvar:: PYTHONEXECUTABLE
If this environment variable is set, ``sys.argv[0]`` will be set to its