diff options
author | Guido van Rossum <guido@python.org> | 2007-05-15 18:46:22 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2007-05-15 18:46:22 +0000 |
commit | 4d637a4cab974d7271961673f894713cab50fc93 (patch) | |
tree | a30bd94366d01eb49ff8a4b99a83f0442671af7c /Lib/threading.py | |
parent | 646bf3aa75c96ebde1168f28c651d2fc56159ba3 (diff) | |
download | cpython-4d637a4cab974d7271961673f894713cab50fc93.tar.gz |
Merged revisions 55328-55341 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines
Implement the removal of tuple parameter unpacking (PEP 3113).
Thanks, Tony Lownds for the patch.
........
r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line
Update to use Python 3.0
........
r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines
Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch.
........
r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line
Fix exception printing (no more exceptions module)
........
r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line
Remove popen* functions from os
........
r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line
Get rid of most of popen. There are still some uses I need to cleanup.
........
r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line
Remove a few more remnants of the compiler package
........
r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line
Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long)
........
Diffstat (limited to 'Lib/threading.py')
-rw-r--r-- | Lib/threading.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 439a3784f8..e87a6530f1 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -128,10 +128,9 @@ class _RLock(_Verbose): # Internal methods used by condition variables - def _acquire_restore(self, (count, owner)): + def _acquire_restore(self, state): self.__block.acquire() - self.__count = count - self.__owner = owner + self.__count, self.__owner = state if __debug__: self._note("%s._acquire_restore()", self) |