Feature fix modules

willie/modules/admin.py

@@ -89,6 +89,8 @@ def msg(bot, trigger):
         return
     if not trigger.admin:
         return
+    if trigger.group(2) is None:
+        return
 
     channel, _sep, message = trigger.group(2).partition(' ')
     message = message.strip()
@@ -109,6 +111,8 @@ def me(bot, trigger):
         return
     if not trigger.admin:
         return
+    if trigger.group(2) is None:
+        return
 
     channel, _sep, action = trigger.group(2).partition(' ')
     action = action.strip()

willie/modules/calc.py

@@ -43,6 +43,9 @@ def c(bot, trigger):
 @example('.py len([1,2,3])', '3')
 def py(bot, trigger):
     """Evaluate a Python expression."""
+    if not trigger.group(2):
+        return bot.say("Need an expression to evaluate")
+
     query = trigger.group(2)
     uri = 'http://tumbolia.appspot.com/py/'
     answer = web.get(uri + web.quote(query))

willie/modules/rand.py

@@ -22,15 +22,18 @@ def rand(bot, trigger):
     arg1 = trigger.group(3)
     arg2 = trigger.group(4)
 
-    if arg2 is not None:
-        low = int(arg1)
-        high = int(arg2)
-    elif arg1 is not None:
-        low = 0
-        high = int(arg1)
-    else:
-        low = 0
-        high = sys.maxint
+    try:
+        if arg2 is not None:
+            low = int(arg1)
+            high = int(arg2)
+        elif arg1 is not None:
+            low = 0
+            high = int(arg1)
+        else:
+            low = 0
+            high = sys.maxint
+    except (ValueError, TypeError):
+        return bot.reply("Arguments must be of integer type")
 
     if low > high:
         low, high = high, low