diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-04 11:02:30 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-04 11:02:30 (GMT) |
commit | 11edf29025d86ce9bca56bba88004e4930a717af (patch) | |
tree | c9d5bbaee564917f97b042516661698b1cc2402d | |
parent | 12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d (diff) | |
parent | 51b90d28e21293cbb6763c26ea88de45508c2de9 (diff) | |
download | cpython-11edf29025d86ce9bca56bba88004e4930a717af.zip cpython-11edf29025d86ce9bca56bba88004e4930a717af.tar.gz cpython-11edf29025d86ce9bca56bba88004e4930a717af.tar.bz2 |
Merge 3.6
-rw-r--r-- | Lib/datetime.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py index 7540109..5d5579c 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -1053,7 +1053,7 @@ class time: 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 |