[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/cd7852cdae06
changeset:   93186:cd7852cdae06
parent:      93184:7ffed656036f
parent:      93185:1f13fb745d42
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 28 17:15:26 2014 +0100
summary:
  merge with 3.4

files:
  Doc/using/cmdline.rst |  8 --------
  Misc/python.man       |  5 -----
  2 files changed, 0 insertions(+), 13 deletions(-)


diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -468,14 +468,6 @@
    :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
diff --git a/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -384,11 +384,6 @@
 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

-- 
Repository URL: https://hg.python.org/cpython