Issue #1856: Avoid crashes and lockups when daemon threads run while the

interpreter is shutting down; instead, these threads are now killed when
they try to take the GIL.

diff --cc Include/pythonrun.h
Simple merge

diff --cc Lib/test/test_threading.py
Simple merge

diff --cc Misc/NEWS
index 13b42e2b1a175af7ff0783ca94468ec4fec7e3f6,ca22acf2abd0a6cfefa7da54f3ef9a2e391d73c1..5fa8e70c869e1dbc5bbe0359a52e7cbe581aac17
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,10 +10,14 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #1856: Avoid crashes and lockups when daemon threads run while the
+   interpreter is shutting down; instead, these threads are now killed when
+   they try to take the GIL.
+ 
 +- Issue #11849: Make it more likely for the system allocator to release
 +  free()d memory arenas on glibc-based systems.  Patch by Charles-François
 +  Natali.
 +
  - Issue #9756: When calling a method descriptor or a slot wrapper descriptor,
    the check of the object type doesn't read the __class__ attribute anymore.
    Fix a crash if a class override its __class__ attribute (e.g. a proxy of the

diff --cc Python/ceval.c
Simple merge

diff --cc Python/pythonrun.c
Simple merge

diff --cc Python/thread_pthread.h
Simple merge