summaryrefslogtreecommitdiffstats
path: root/Doc/using/cmdline.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-28 16:15:26 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-28 16:15:26 (GMT)
commitb7374d0271765f0abeb92f8d87b0ce9b0c2be3df (patch)
tree7faa2e4366b936e64b5c026017f73d3e0cf02ef6 /Doc/using/cmdline.rst
parentacae08eb9da580b3005a4cdab40afb44aa446da0 (diff)
parent75f7490843499812b3537fea31fc89e220e43a45 (diff)
downloadcpython-b7374d0271765f0abeb92f8d87b0ce9b0c2be3df.zip
cpython-b7374d0271765f0abeb92f8d87b0ce9b0c2be3df.tar.gz
cpython-b7374d0271765f0abeb92f8d87b0ce9b0c2be3df.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/using/cmdline.rst')
-rw-r--r--Doc/using/cmdline.rst8
1 files changed, 0 insertions, 8 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 55e0e67..bf4c1ab 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -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