Issue #29078: Merge 3.5.

This commit is contained in:
Xiang Zhang 2016-12-27 12:30:42 +08:00
commit b8a1aebb3d
2 changed files with 2 additions and 2 deletions

View file

@ -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)

View file

@ -1704,7 +1704,6 @@ Nickolai Zeldovich
Yuxiao Zeng
Uwe Zessin
Cheng Zhang
Xiang Zhang
Kai Zhu
Tarek Ziadé
Jelle Zijlstra
@ -1712,3 +1711,4 @@ Gennadiy Zlobin
Doug Zongker
Peter Åstrand
evilzero
Dhushyanth Ramasamy