mirror of
https://github.com/python/cpython.git
synced 2025-12-23 09:19:18 +00:00
Issue #29078: Merge 3.5.
This commit is contained in:
commit
b8a1aebb3d
2 changed files with 2 additions and 2 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue