merge 3.4-slp (Stackless python#93)

Author: Anselm Kruis

Stackless/unittests/test_thread.py

@@ -469,7 +469,7 @@ class MyException(Exception):
         self.assertEqual(t.thread_id, -1)
         self.assertRaises(RuntimeError, t.switch)
         self.assertEqual(t.thread_id, -1)
-        self.assertRaises(MyException, t.raise_exception, MyException, 'test')
+        self.assertRaises(RuntimeError, t.raise_exception, MyException, 'test')
         self.assertEqual(t.thread_id, -1)
         self.assertRaises(RuntimeError, t.throw, MyException)
         self.assertEqual(t.thread_id, -1)