diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/site.rst | 48 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 12 | ||||
| -rw-r--r-- | Doc/using/cmdline.rst | 43 |
3 files changed, 96 insertions, 7 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 diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 65408ce..14aa28d 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1141,13 +1141,13 @@ The conversion types are: +------------+-----------------------------------------------------+-------+ | ``'F'`` | Floating point decimal format. | \(3) | +------------+-----------------------------------------------------+-------+ -| ``'g'`` | Floating point format. Uses exponential format if | \(4) | -| | exponent is greater than -4 or less than precision, | | -| | decimal format otherwise. | | +| ``'g'`` | Floating point format. Uses lowercase exponential | \(4) | +| | format if exponent is less than -4 or not less than | | +| | precision, decimal format otherwise. | | +------------+-----------------------------------------------------+-------+ -| ``'G'`` | Floating point format. Uses exponential format if | \(4) | -| | exponent is greater than -4 or less than precision, | | -| | decimal format otherwise. | | +| ``'G'`` | Floating point format. Uses uppercase exponential | \(4) | +| | format if exponent is less than -4 or not less than | | +| | precision, decimal format otherwise. | | +------------+-----------------------------------------------------+-------+ | ``'c'`` | Single character (accepts integer or single | | | | character string). | | diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index ca6126a..1021e53 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -21,7 +21,7 @@ Command line When invoking Python, you may specify any of these options:: - python [-bdEiOStuUvxX?] [-c command | -m module-name | script | - ] [args] + python [-bdEiOsStuUvxX?] [-c command | -m module-name | script | - ] [args] The most common use case is, of course, a simple invocation of a script:: @@ -214,6 +214,29 @@ Miscellaneous options +<<<<<<< .working +======= + .. seealso:: + :file:`Tools/scripts/fixdiv.py` + for a use of ``warnall`` + + :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 + +>>>>>>> .merge-right.r62788 Disable the import of the module :mod:`site` and the site-dependent manipulations of :data:`sys.path` that it entails. @@ -424,6 +447,24 @@ These environment variables influence Python's behavior. .. versionadded:: 2.6 +.. envvar:: PYTHONNOUSERSITE + + If this is set, Python won't add the user site directory to sys.path + + .. seealso:: + + :pep:`370` -- Per user site-packages directory + + +.. envvar:: PYTHONUSERBASE + + Sets the base directory for the user site directory + + .. seealso:: + + :pep:`370` -- Per user site-packages directory + + .. envvar:: PYTHONEXECUTABLE If this environment variable is set, ``sys.argv[0]`` will be set to its |