Merge branch 'master' of 89.22.98.13:2012/brathuhn

master
fbr 14 years ago
commit e2bca78d46
  1. 1
      brathuhn.py
  2. 2
      tell.py

@ -262,6 +262,7 @@ def loop():
print "-------ERROR OCCURED-------"
exc_type, exc_value, exc_traceback = sys.exc_info()
traceback.print_tb(exc_traceback, file=sys.stdout)
traceback.print_exc(file=sys.stdout)
if not cl.connected:
s=MIN_CONNECT_INTERVAL-(time.time()-last_connect)
if s>0:

@ -45,7 +45,7 @@ def tellCB(nick, msg, status):
if(status != brathuhn.STATUS_JOIN):
return
user = nick.getResource()
rem = []
for l in store:

Loading…
Cancel
Save