summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Brewer <fumanchu@aminus.org>2006-12-11 23:12:07 +0000
committerRobert Brewer <fumanchu@aminus.org>2006-12-11 23:12:07 +0000
commitbb56e28156a55dc5d816dd74f4a162f3fa80c07b (patch)
tree606317a109f5b3e1ec205aa72fbb4530a90df442
parentf1e70ace3592804829f8071201b206afd05b73b4 (diff)
downloadcherrypy-bb56e28156a55dc5d816dd74f4a162f3fa80c07b.tar.gz
2.x backport of [1479] (Fix for thread locals on Jython; see http://groups.google.com/group/cherrypy-users/browse_frm/thread/ccbad8001cdc0146 and also http://article.gmane.org/gmane.comp.lang.jython.devel/2601 and its responses).
-rw-r--r--cherrypy/_cpthreadinglocal.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cherrypy/_cpthreadinglocal.py b/cherrypy/_cpthreadinglocal.py
index 0006ea53..34c17ac4 100644
--- a/cherrypy/_cpthreadinglocal.py
+++ b/cherrypy/_cpthreadinglocal.py
@@ -142,7 +142,7 @@ class _localbase(object):
def __new__(cls, *args, **kw):
self = object.__new__(cls)
- key = '_local__key', 'thread.local.' + str(id(self))
+ key = 'thread.local.' + str(id(self))
object.__setattr__(self, '_local__key', key)
object.__setattr__(self, '_local__args', (args, kw))
object.__setattr__(self, '_local__lock', RLock())