Merge 3.5 (fix raise)
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index a4aa49f..845e7d4 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1043,6 +1043,24 @@
self.assertEqual(out, b'')
self.assertNotIn("Unhandled exception", err.decode())
+ def test_bare_raise_in_brand_new_thread(self):
+ def bare_raise():
+ raise
+
+ class Issue27558(threading.Thread):
+ exc = None
+
+ def run(self):
+ try:
+ bare_raise()
+ except Exception as exc:
+ self.exc = exc
+
+ thread = Issue27558()
+ thread.start()
+ thread.join()
+ self.assertIsNotNone(thread.exc)
+ self.assertIsInstance(thread.exc, RuntimeError)
class TimerTests(BaseTestCase):
diff --git a/Misc/NEWS b/Misc/NEWS
index 2246f22..2cd61e6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,12 +10,17 @@
Core and Builtins
-----------------
+- Issue #27558: Fix a SystemError in the implementation of "raise" statement.
+ In a brand new thread, raise a RuntimeError since there is no active
+ exception to reraise. Patch written by Xiang Zhang.
+
Library
-------
- Issue #9998: On Linux, ctypes.util.find_library now looks in LD_LIBRARY_PATH
for shared libraries.
+
What's New in Python 3.6.0 alpha 4
==================================
diff --git a/Python/ceval.c b/Python/ceval.c
index 07ac167..8e7d5c2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4154,7 +4154,7 @@
type = tstate->exc_type;
value = tstate->exc_value;
tb = tstate->exc_traceback;
- if (type == Py_None) {
+ if (type == Py_None || type == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"No active exception to reraise");
return 0;