diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-06 23:45:46 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-06 23:45:46 (GMT) |
| commit | 8dc226fccd2183670ac19a85b89941f5b05167dc (patch) | |
| tree | a02b3f53c54d1e18139d53de40954828350fabcb /Doc/library/site.rst | |
| parent | 1bf7108fd515af1b537dcbf738c3cb488af5ab0d (diff) | |
| download | cpython-8dc226fccd2183670ac19a85b89941f5b05167dc.zip cpython-8dc226fccd2183670ac19a85b89941f5b05167dc.tar.gz cpython-8dc226fccd2183670ac19a85b89941f5b05167dc.tar.bz2 | |
Merged revisions 62774-62775,62785,62787-62788 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62774 | georg.brandl | 2008-05-06 19:11:42 +0200 (Tue, 06 May 2008) | 2 lines
#2773: fix description of 'g' and 'G' formatting spec.
........
r62775 | georg.brandl | 2008-05-06 19:20:54 +0200 (Tue, 06 May 2008) | 2 lines
> != (!<).
........
r62785 | benjamin.peterson | 2008-05-07 00:18:11 +0200 (Wed, 07 May 2008) | 2 lines
Fix logic error in Python/_warnings.c and add a test to verify
........
r62787 | benjamin.peterson | 2008-05-07 00:31:52 +0200 (Wed, 07 May 2008) | 2 lines
Make the Python implementation of warnings compatible with the C implementation regarding non-callable showwarning
........
r62788 | christian.heimes | 2008-05-07 00:41:46 +0200 (Wed, 07 May 2008) | 1 line
Implemented PEP 370
........
Diffstat (limited to 'Doc/library/site.rst')
| -rw-r--r-- | Doc/library/site.rst | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/Doc/library/site.rst b/Doc/library/site.rst index cf2892f..354043f 100644 --- a/Doc/library/site.rst +++ b/Doc/library/site.rst @@ -82,3 +82,51 @@ Note that for some non-Unix systems, ``sys.prefix`` and ``sys.exec_prefix`` are 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 |