[Python-checkins] cpython (merge 3.6 -> default): Issue #29078: Merge 3.6.

[xiang.zhang]

https://hg.python.org/cpython/rev/f35c3b0b6eda
changeset:   105830:f35c3b0b6eda
parent:      105826:1970c9ea8572
parent:      105829:83b089b7ab43
user:        Xiang Zhang <angwerzx at 126.com>
date:        Tue Dec 27 12:32:33 2016 +0800
summary:
  Issue #29078: Merge 3.6.

files:
  Doc/library/datetime.rst |  2 +-
  Misc/ACKS                |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1582,7 +1582,7 @@
 
 Example:
 
-    >>> from datetime import time, tzinfo
+    >>> from datetime import time, tzinfo, timedelta
     >>> class GMT1(tzinfo):
     ...     def utcoffset(self, dt):
     ...         return timedelta(hours=1)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1707,7 +1707,6 @@
 Yuxiao Zeng
 Uwe Zessin
 Cheng Zhang
-Xiang Zhang
 Kai Zhu
 Tarek Ziadé
 Jelle Zijlstra
@@ -1715,3 +1714,4 @@
 Doug Zongker
 Peter Åstrand
 evilzero
+Dhushyanth Ramasamy

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