# HG changeset patch # User Charly COSTE # Date 1250980681 -7200 # Node ID ebf516b2e5c9f62fb4cff1903417432ee64e5109 # Parent 57d0e66378b029e71d255de097959a85408f6fc5 Switched from Lock() to RLock(). Signed-off-by: Charly COSTE diff --git a/bot.py b/bot.py --- a/bot.py +++ b/bot.py @@ -426,7 +426,7 @@ class bot(Thread): return c self.error('===> Debug: opening new XMPP connection for "'+nickname+'"', debug=True) c = xmpp.client.Client(self.bare_jid.getDomain(), debug=[]) - c.lock = threading.Lock() + c.lock = threading.RLock() c.lock.acquire() self.xmpp_connections[nickname] = c c.used_by = 1 diff --git a/irclib.py b/irclib.py --- a/irclib.py +++ b/irclib.py @@ -436,7 +436,7 @@ class ServerConnection(Connection): return self - self.lock = threading.Lock() + self.lock = threading.RLock() self.lock.acquire() self.nick_callbacks = [] self.previous_buffer = ""