mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 21:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #29078: Merge 3.6.

Browse source
This commit is contained in:
Xiang Zhang 2016-12-27 12:32:33 +08:00
commit b3b01c3248
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/datetime.rst
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)

2
Misc/ACKS
View file

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