mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 62774-62775,62785,62787-62788 via svnmerge from

Browse source 
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
........
This commit is contained in:
Christian Heimes 2008-05-06 23:45:46 +00:00
parent 1bf7108fd5
commit 8dc226fccd
13 changed files with 458 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Doc/using/cmdline.rst
View file

@ -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