Merge heads

This commit is contained in:
Serhiy Storchaka 2013-11-23 19:08:38 +02:00
commit 434d27a490
2 changed files with 7 additions and 1 deletions

View File

@ -183,8 +183,10 @@ class Y1900Tests(unittest.TestCase):
"""
def test_y_before_1900(self):
# Issue #13674, #19634
t = (1899, 1, 1, 0, 0, 0, 0, 0, 0)
if sys.platform == "win32" or sys.platform.startswith("aix"):
if (sys.platform == "win32"
or sys.platform.startswith(("aix", "sunos", "solaris"))):
with self.assertRaises(ValueError):
time.strftime("%y", t)
else:

View File

@ -85,6 +85,10 @@ Library
- Issue #19673: Add pathlib to the stdlib as a provisional module (PEP 428).
- Issue #16596: pdb in a generator now properly skips over yield and
yield from rather than stepping out of the generator into its
caller. (This is essential for stepping through asyncio coroutines.)
- Issue #17916: Added dis.Bytecode.from_traceback() and
dis.Bytecode.current_offset to easily display "current instruction"
markers in the new disassembly API (Patch by Claudiu Popa).