remove the deprecation warnings for the old threading API; update the docs

Reviewer: Benjamin Peterson

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index b5f997eb045827a8e3e5b95eea1afe611e061016..9cc62be982dc6f987e067f0f2e8d069197ddc3da 100644 (file)
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -14,11 +14,9 @@ The :mod:`dummy_threading` module is provided for situations where
 
 .. note::
 
-   Some ``camelCase`` names have been converted to their underscored
-   equivalents. Others have been replaced by properties.  Using the old methods
-   in 2.6 will trigger a :exc:`DeprecationWarning` when Python is run with the
-   :option:`-3` flag and a full :exc:`DeprecationWarning` in 3.0.  The old names
-   will be removed early in the 3.x series.
+   While they are not listed below, the ``camelCase`` names used for some
+   methods and functions in this module in the Python 2.x series are still
+   supported by this module.
 
 This module defines the following functions and objects:
 

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index c6a5cf49d2a1e47c86b4c4dda3256df8db8c9bbb..775e312667235b53a9a13eafc1013a1cffd4e9eb 100644 (file)
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -323,44 +323,18 @@ class ThreadTests(unittest.TestCase):
                           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):

diff --git a/Lib/threading.py b/Lib/threading.py
index 48c63ce8db789f9eaffb3f0f3837e2d86f58a3e7..1d59cb0f1e4fafcd4666e1e58fbce85111486fe2 100644 (file)
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -2,12 +2,22 @@
 
 import sys as _sys
 import _thread
-import warnings
 
 from time import time as _time, sleep as _sleep
 from traceback import format_exc as _format_exc
 from collections import deque
 
+# Note regarding PEP 8 compliant names
+#  This threading model was originally inspired by Java, and inherited
+# the convention of camelCase function and method names from that
+# language. Those originaly names are not in any imminent danger of
+# being deprecated (even for Py3k),so this module provides them as an
+# alias for the PEP 8 compliant names
+# Note that using the new PEP 8 compliant names facilitates substitution
+# with the multiprocessing module, which doesn't provide the old
+# Java inspired names.
+
+
 # Rename some stuff so "from threading import *" is safe
 __all__ = ['active_count', 'Condition', 'current_thread', 'enumerate', 'Event',
            'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread',
@@ -262,6 +272,8 @@ class _Condition(_Verbose):
     def notify_all(self):
         self.notify(len(self._waiters))
 
+    notifyAll = notify_all
+
 
 def Semaphore(*args, **kwargs):
     return _Semaphore(*args, **kwargs)
@@ -341,10 +353,7 @@ class _Event(_Verbose):
     def is_set(self):
         return self._flag
 
-    def isSet(self):
-        warnings.warn("isSet() is deprecated in favor of is_set()",
-                      DeprecationWarning)
-        return self.is_set()
+    isSet = is_set
 
     def set(self):
         self._cond.acquire()
@@ -646,10 +655,7 @@ class Thread(_Verbose):
         assert self._initialized, "Thread.__init__() not called"
         return self._started.is_set() and not self._stopped
 
-    def isAlive(self):
-        warnings.warn("isAlive() is deprecated in favor of is_alive()",
-                      DeprecationWarning)
-        return self.is_alive()
+    isAlive = is_alive
 
     @property
     def daemon(self):
@@ -665,23 +671,15 @@ class Thread(_Verbose):
         self._daemonic = daemonic
 
     def isDaemon(self):
-        warnings.warn("isDaemon() is deprecated in favor of the " \
-                      "Thread.daemon property", DeprecationWarning)
         return self.daemon
 
     def setDaemon(self, daemonic):
-        warnings.warn("setDaemon() is deprecated in favor of the " \
-                      "Thread.daemon property", DeprecationWarning)
         self.daemon = daemonic
 
     def getName(self):
-        warnings.warn("getName() is deprecated in favor of the " \
-                      "Thread.name property", DeprecationWarning)
         return self.name
 
     def setName(self, name):
-        warnings.warn("setName() is deprecated in favor of the " \
-                      "Thread.name property", DeprecationWarning)
         self.name = name
 
 # The timer class was contributed by Itamar Shtull-Trauring
@@ -790,9 +788,7 @@ def current_thread():
         ##print "current_thread(): no current thread for", _get_ident()
         return _DummyThread()
 
-def currentThread():
-    warnings.warn("currentThread() is deprecated in favor of current_thread()",
-                  DeprecationWarning)
+currentThread = current_thread
 
 def active_count():
     _active_limbo_lock.acquire()
@@ -800,10 +796,7 @@ def active_count():
     _active_limbo_lock.release()
     return count
 
-def activeCount():
-    warnings.warn("activeCount() is deprecated in favor of active_count()",
-                  DeprecationWarning)
-    return active_count()
+activeCount = active_count
 
 def enumerate():
     _active_limbo_lock.acquire()

diff --git a/Misc/NEWS b/Misc/NEWS
index 2f1f58a30839e2509763cdfafea3d45fbf343646..5947aeb303014aeaf7b7adddfe278b6f71aa797a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,8 @@ C API
 Library
 -------
 
+- The deprecation warnings for the camelCase threading API names were removed.
+
 Extension Modules
 -----------------