Issue #29078: Merge 3.6.

b3b01c32 · Xiang Zhang · efda8a4f · b8a1aebb · b3b01c32 · b3b01c32
Commit b3b01c32 authored Dec 27, 2016 by Xiang Zhang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/library/datetime.rst Doc/library/datetime.rst +1 -1

Misc/ACKS Misc/ACKS +1 -1

No files found.
--- 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