From 672b8031a803fa420cac91cdaab02130c1f8bed0 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 11 Jun 2008 19:14:14 +0000 Subject: Merged revisions 64125 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64125 | benjamin.peterson | 2008-06-11 12:27:50 -0500 (Wed, 11 Jun 2008) | 2 lines give the threading API PEP 8 names ........ --- Lib/multiprocessing/synchronize.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Lib/multiprocessing/synchronize.py') diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py index 44b1171bf4a..628792eb659 100644 --- a/Lib/multiprocessing/synchronize.py +++ b/Lib/multiprocessing/synchronize.py @@ -109,8 +109,8 @@ class Lock(SemLock): try: if self._semlock._is_mine(): name = current_process().get_name() - if threading.currentThread().getName() != 'MainThread': - name += '|' + threading.currentThread().getName() + if threading.current_thread().get_name() != 'MainThread': + name += '|' + threading.current_thread().get_name() elif self._semlock._get_value() == 1: name = 'None' elif self._semlock._count() > 0: @@ -134,8 +134,8 @@ class RLock(SemLock): try: if self._semlock._is_mine(): name = current_process().get_name() - if threading.currentThread().getName() != 'MainThread': - name += '|' + threading.currentThread().getName() + if threading.current_thread().get_name() != 'MainThread': + name += '|' + threading.current_thread().get_name() count = self._semlock._count() elif self._semlock._get_value() == 1: name, count = 'None', 0 -- cgit v1.2.3