Merge pull request CloudBotIRC#155 from linuxdaemon/gonzobot+fix-karma-errors

Fix argument errors in karma.py

Author: edwardslabs

cloudbot/util/async_util.py

@@ -21,7 +21,7 @@ def wrap_future(fut, *, loop=None):
     else:
         func = asyncio.ensure_future
 
-    return func(fut, loop=loop)
+    return func(fut, loop=loop)  # pylint: disable=locally-disabled, deprecated-method
 
 
 @asyncio.coroutine

plugins/history.py

@@ -83,7 +83,7 @@ def resethistory(event, conn):
 
 
 @hook.command()
-def seen(text, nick, chan, db, event, is_valid_nick):
+def seen(text, nick, chan, db, event, is_nick_valid):
     """<nick> <channel> - tells when a nickname was last in active in one of my channels
     :type db: sqlalchemy.orm.Session
     :type event: cloudbot.event.Event
@@ -95,7 +95,7 @@ def seen(text, nick, chan, db, event, is_valid_nick):
     if text.lower() == nick.lower():
         return "Have you looked in a mirror lately?"
 
-    if not is_valid_nick(text):
+    if not is_nick_valid(text):
         return "I can't look up that name, its impossible to use!"
 
     if '_' in text:

plugins/karma.py

@@ -54,7 +54,7 @@ def addpoint(text, nick, chan, db):
 
 
 @hook.regex(karmaplus_re)
-def re_addpt(match, nick, chan, db, conn, notice):
+def re_addpt(match, nick, chan, db, notice):
     """no useful help txt"""
     thing = match.group().split('++')[0]
     if thing:
@@ -113,7 +113,7 @@ def minuspts(nick, chan, db):
 
 
 @hook.regex(karmaminus_re)
-def re_rmpt(match, nick, chan, db, conn, notice):
+def re_rmpt(match, nick, chan, db, notice):
     """no useful help txt"""
     thing = match.group().split('--')[0]
     if thing: