diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-06-11 19:14:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-06-11 19:14:14 (GMT) |
| commit | 672b8031a803fa420cac91cdaab02130c1f8bed0 (patch) | |
| tree | cff73aa339853806887dd85bf1df34f088532efe /Lib/_threading_local.py | |
| parent | 559e5d7f4d1155e95fb6f925c927a263f9196935 (diff) | |
| download | cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.zip cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.gz cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.bz2 | |
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
........
Diffstat (limited to 'Lib/_threading_local.py')
| -rw-r--r-- | Lib/_threading_local.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/_threading_local.py b/Lib/_threading_local.py index 40a07f0..6d77035 100644 --- a/Lib/_threading_local.py +++ b/Lib/_threading_local.py @@ -161,16 +161,16 @@ class _localbase(object): # __init__ being called, to make sure we don't call it # again ourselves. dict = object.__getattribute__(self, '__dict__') - currentThread().__dict__[key] = dict + current_thread().__dict__[key] = dict return self def _patch(self): key = object.__getattribute__(self, '_local__key') - d = currentThread().__dict__.get(key) + d = current_thread().__dict__.get(key) if d is None: d = {} - currentThread().__dict__[key] = d + current_thread().__dict__[key] = d object.__setattr__(self, '__dict__', d) # we have a new instance dict, so call out __init__ if we have @@ -237,4 +237,4 @@ class local(_localbase): except KeyError: pass # didn't have anything in this thread -from threading import currentThread, RLock +from threading import current_thread, RLock |