summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-11-23 17:08:38 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-11-23 17:08:38 (GMT)
commit434d27a4906a8567a4b1c8d73128038dc788fd6b (patch)
tree4209c2a3a9d46f9bbd29e0ee8e751bc5339f68bf
parentbe0c3250b1bbc16eea41dfe0f93f33ad384e9bd4 (diff)
parent0da64f7ffb35db7f71c389214bc68cc91d5cb091 (diff)
downloadcpython-434d27a4906a8567a4b1c8d73128038dc788fd6b.zip
cpython-434d27a4906a8567a4b1c8d73128038dc788fd6b.tar.gz
cpython-434d27a4906a8567a4b1c8d73128038dc788fd6b.tar.bz2
Merge heads
-rw-r--r--Lib/test/test_strftime.py4
-rw-r--r--Misc/NEWS4
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index ff6274e..772cd06 100644
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 668162f..3d5cd7e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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).