Issue #29078: Merge 3.6.

2016-12-27 12:32:33 +08:00 · 2016-12-27 12:32:33 +08:00 · b3b01c3248
parent efda8a4f36 b8a1aebb3d
commit b3b01c3248
2 changed files with 2 additions and 2 deletions
--- 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)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -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