remove the deprecation warnings for the old threading API; update the docs
Reviewer: Benjamin Peterson
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index c6a5cf4..775e312 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -323,44 +323,18 @@
msg=('%d references still around' %
sys.getrefcount(weak_raising_cyclic_object())))
- def test_pep8ified_threading(self):
- def check(_, w, msg):
- self.assertEqual(str(w.message), msg)
-
+ def test_old_threading_api(self):
+ # Just a quick sanity check to make sure the old method names are
+ # still present
t = threading.Thread()
- with catch_warning() as w:
- try:
- del threading.__warningregistry__
- except AttributeError:
- pass
- msg = "isDaemon() is deprecated in favor of the " \
- "Thread.daemon property"
- check(t.isDaemon(), w, msg)
- w.reset()
- msg = "setDaemon() is deprecated in favor of the " \
- "Thread.daemon property"
- check(t.setDaemon(True), w, msg)
- w.reset()
- msg = "getName() is deprecated in favor of the " \
- "Thread.name property"
- check(t.getName(), w, msg)
- w.reset()
- msg = "setName() is deprecated in favor of the " \
- "Thread.name property"
- check(t.setName("name"), w, msg)
- w.reset()
- msg = "isAlive() is deprecated in favor of is_alive()"
- check(t.isAlive(), w, msg)
- w.reset()
- e = threading.Event()
- msg = "isSet() is deprecated in favor of is_set()"
- check(e.isSet(), w, msg)
- w.reset()
- msg = "currentThread() is deprecated in favor of current_thread()"
- check(threading.currentThread(), w, msg)
- w.reset()
- msg = "activeCount() is deprecated in favor of active_count()"
- check(threading.activeCount(), w, msg)
+ t.isDaemon()
+ t.setDaemon(True)
+ t.getName()
+ t.setName("name")
+ t.isAlive()
+ e = threading.Event()
+ e.isSet()
+ threading.activeCount()
class ThreadJoinOnShutdown(unittest.TestCase):