Merge branch 'master' of https://github.com/sbp/phenny

Conflicts: irc.py modules/oblique.py modules/startup.py
2012-02-17 22:10:05 -05:00
parent f1e523e9bd 6198b30d76
commit 09e26155ce
4 changed files with 7 additions and 3 deletions
--- a/modules/startup.py
+++ b/modules/startup.py
@@ -58,11 +58,12 @@ def startup(phenny, input):

    if hasattr(phenny.config, 'password'): 
        phenny.msg('NickServ', 'IDENTIFY %s' % phenny.config.password)
-        __import__('time').sleep(5)
+        time.sleep(5)

    # Cf. http://swhack.com/logs/2005-12-05#T19-32-36
    for channel in phenny.channels: 
        phenny.write(('JOIN', channel))
+        time.sleep(0.5)
 startup.rule = r'(.*)'
 startup.event = '251'
 startup.priority = 'low'