diff options
| author | Xiang Zhang <angwerzx@126.com> | 2016-12-27 04:32:33 (GMT) |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2016-12-27 04:32:33 (GMT) |
| commit | b3b01c3248825fa510a9b69ecb062c8ebc3422f2 (patch) | |
| tree | 98c3387d77b16e8e08322107a752ba133ea4c6cc | |
| parent | efda8a4f36a5c226765b0603d14c230d2e21a17e (diff) | |
| parent | b8a1aebb3d604924e42653feb536ef7e978ac59a (diff) | |
| download | cpython-b3b01c3248825fa510a9b69ecb062c8ebc3422f2.zip cpython-b3b01c3248825fa510a9b69ecb062c8ebc3422f2.tar.gz cpython-b3b01c3248825fa510a9b69ecb062c8ebc3422f2.tar.bz2 | |
Issue #29078: Merge 3.6.
| -rw-r--r-- | Doc/library/datetime.rst | 2 | ||||
| -rw-r--r-- | Misc/ACKS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 9dab353..c931855 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1582,7 +1582,7 @@ Instance methods: Example: - >>> from datetime import time, tzinfo + >>> from datetime import time, tzinfo, timedelta >>> class GMT1(tzinfo): ... def utcoffset(self, dt): ... return timedelta(hours=1) @@ -1707,7 +1707,6 @@ Nickolai Zeldovich Yuxiao Zeng Uwe Zessin Cheng Zhang -Xiang Zhang Kai Zhu Tarek Ziadé Jelle Zijlstra @@ -1715,3 +1714,4 @@ Gennadiy Zlobin Doug Zongker Peter Åstrand evilzero +Dhushyanth Ramasamy |