Merged revisions 65818 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65818 | benjamin.peterson | 2008-08-18 11:40:03 -0500 (Mon, 18 Aug 2008) | 4 lines

  change threading.getIdent to a property

  This is new in 2.6 so now need to worry about backwards compatibility :)
........

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 3c5fefd475303d81a9fd2b0592824d1f5f68b789..9e41412b52a5719baaccb19fe7bcce2697459f3c 100644 (file)
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -643,12 +643,12 @@ impossible to detect the termination of alien threads.
    constructor.
 
 
-.. method:: Thread.get_ident()
+.. attribute:: Thread.ident
 
-   Return the 'thread identifier' of this thread or None if the thread has not
-   been started.  This is a nonzero integer.  See the :func:`thread.get_ident()`
+   The 'thread identifier' of this thread or ``None`` if the thread has not been
+   started.  This is a nonzero integer.  See the :func:`thread.get_ident()`
    function.  Thread identifiers may be recycled when a thread exits and another
-   thread is created.  The identifier is returned even after the thread has
+   thread is created.  The identifier is available even after the thread has
    exited.
 
 

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 1abc63f5af41e8c1d97bfa2ec67a7848acd78bb0..0a492974d9d4f8b1defc893951b1d88eba01a0ef 100644 (file)
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -74,7 +74,7 @@ class ThreadTests(unittest.TestCase):
         for i in range(NUMTASKS):
             t = TestThread("<thread %d>"%i, self, sema, mutex, numrunning)
             threads.append(t)
-            self.failUnlessEqual(t.get_ident(), None)
+            self.failUnlessEqual(t.ident, None)
             self.assert_(re.match('<TestThread\(.*, initial\)>', repr(t)))
             t.start()
 
@@ -83,7 +83,7 @@ class ThreadTests(unittest.TestCase):
         for t in threads:
             t.join(NUMTASKS)
             self.assert_(not t.is_alive())
-            self.failIfEqual(t.get_ident(), 0)
+            self.failIfEqual(t.ident, 0)
             self.assert_(re.match('<TestThread\(.*, \w+ -?\d+\)>', repr(t)))
         if verbose:
             print('all tasks done')

diff --git a/Lib/threading.py b/Lib/threading.py
index 48321014c2cd4ab61f512419e22361c50b0c22a8..ccbd67e7c6b2509352c7d53f089c60ddec0a207c 100644 (file)
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -629,7 +629,8 @@ class Thread(_Verbose):
         assert self._initialized, "Thread.__init__() not called"
         self._name = str(name)
 
-    def get_ident(self):
+    @property
+    def ident(self):
         assert self._initialized, "Thread.__init__() not called"
         return self._ident