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

Mon Dec 26 23:39:08 EST 2016

https://hg.python.org/cpython/rev/83b089b7ab43
changeset: 105829:83b089b7ab43
branch: 3.6
parent: 105822:02acb2f9c908
parent: 105828:172b2ac82037
user: Xiang Zhang <angwerzx at 126.com>
date: Tue Dec 27 12:30:42 2016 +0800
summary:
 Issue #29078: Merge 3.5.
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
@@ -1704,7 +1704,6 @@
 Yuxiao Zeng
 Uwe Zessin
 Cheng Zhang
-Xiang Zhang
 Kai Zhu
 Tarek Ziadé
 Jelle Zijlstra
@@ -1712,3 +1711,4 @@
 Doug Zongker
 Peter Åstrand
 evilzero
+Dhushyanth Ramasamy
-- 
Repository URL: https://hg.python.org/cpython
