summaryrefslogtreecommitdiffstats
path: root/Misc/python.man
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 /Misc/python.man
parentacae08eb9da580b3005a4cdab40afb44aa446da0 (diff)
parent75f7490843499812b3537fea31fc89e220e43a45 (diff)
downloadcpython-b7374d0271765f0abeb92f8d87b0ce9b0c2be3df.zip
cpython-b7374d0271765f0abeb92f8d87b0ce9b0c2be3df.tar.gz
cpython-b7374d0271765f0abeb92f8d87b0ce9b0c2be3df.tar.bz2
merge with 3.4
Diffstat (limited to 'Misc/python.man')
-rw-r--r--Misc/python.man5
1 files changed, 0 insertions, 5 deletions
diff --git a/Misc/python.man b/Misc/python.man
index 52aedee..048a68a 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -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