[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6

[victor.stinner]

https://hg.python.org/cpython/rev/ee1390c9b585
changeset:   105994:ee1390c9b585
parent:      105992:0ce5151fe57e
parent:      105993:5c02f689c62c
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Jan 04 12:02:30 2017 +0100
summary:
  Merge 3.6

files:
  Lib/datetime.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1053,7 +1053,7 @@
         hour, minute (required)
         second, microsecond (default to zero)
         tzinfo (default to None)
-        fold (keyword only, default to True)
+        fold (keyword only, default to zero)
         """
         if isinstance(hour, bytes) and len(hour) == 6 and hour[0]&0x7F < 24:
             # Pickle support

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