Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-28 17:15:26 +01:00
parent acae08eb9d 75f7490843
commit b7374d0271
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/using/cmdline.rst
View File

@ -468,14 +468,6 @@ conflict.
:data:`sys.ps2` and the hook :data:`sys.__interactivehook__` in this file.
.. envvar:: PYTHONY2K
Set this to a non-empty string to cause the :mod:`time` module to require
dates specified as strings to include 4-digit years, otherwise 2-digit years
are converted based on rules described in the :mod:`time` module
documentation.
.. envvar:: PYTHONOPTIMIZE
If this is set to a non-empty string it is equivalent to specifying the

5
Misc/python.man
View File

@ -384,11 +384,6 @@ You can also change the prompts
and
.I sys.ps2
in this file.
.IP PYTHONY2K
Set this to a non-empty string to cause the \fItime\fP module to
require dates specified as strings to include 4-digit years, otherwise
2-digit years are converted based on rules described in the \fItime\fP
module documentation.
.IP PYTHONOPTIMIZE
If this is set to a non-empty string it is equivalent to specifying
the \fB\-O\fP option. If set to an integer, it is equivalent to