Fixed formatting and changed string construction.

plugins/admin.py

@@ -5,9 +5,10 @@ import json
 import time
 import subprocess
 
+
 @hook.command(autohelp=False, permissions=["permissions_users"])
 def permissions(inp, bot=None, notice=None):
-    "permissions [group] -- lists the users and their permission level who have permissions."
+    """permissions [group] -- lists the users and their permission level who have permissions."""
     permissions = bot.config.get("permissions", [])
     groups = []
     if inp:
@@ -34,8 +35,8 @@ def permissions(inp, bot=None, notice=None):
 
 @hook.command(permissions=["permissions_users"])
 def deluser(inp, bot=None, notice=None):
-    "deluser [user] [group] -- removes elevated permissions from [user]. " \
+    """deluser [user] [group] -- removes elevated permissions from [user].
-    "If [group] is specified, they will only be removed from [group]."
+    If [group] is specified, they will only be removed from [group]."""
     permissions = bot.config.get("permissions", [])
     inp = inp.split(" ")
     groups = []
@@ -69,10 +70,11 @@ def deluser(inp, bot=None, notice=None):
         if removed == 0:
             notice("%s is not in any groups" % inp[0])
 
+
 @hook.command(permissions=["permissions_users"])
 def adduser(inp, bot=None, notice=None):
-    "adduser [user] [group] -- adds elevated permissions to [user]. " \
+    """adduser [user] [group] -- adds elevated permissions to [user].
-    "[group] must be specified."
+    [group] must be specified."""
     permissions = bot.config.get("permissions", [])
     inp = inp.split(" ")
     try:
@@ -102,7 +104,7 @@ def adduser(inp, bot=None, notice=None):
 @hook.command("quit", autohelp=False, permissions=["botcontrol"])
 @hook.command(autohelp=False, permissions=["botcontrol"])
 def stop(inp, nick=None, conn=None):
-    "stop [reason] -- Kills the bot with [reason] as its quit message."
+    """stop [reason] -- Kills the bot with [reason] as its quit message."""
     if inp:
         conn.cmd("QUIT", ["Killed by %s (%s)" % (nick, inp)])
     else:
@@ -113,7 +115,7 @@ def stop(inp, nick=None, conn=None):
 
 @hook.command(autohelp=False, permissions=["botcontrol"])
 def restart(inp, nick=None, conn=None):
-    "restart [reason] -- Restarts the bot with [reason] as its quit message."
+    """restart [reason] -- Restarts the bot with [reason] as its quit message."""
     if inp:
         conn.cmd("QUIT", ["Restarted by %s (%s)" % (nick, inp)])
     else:
@@ -124,22 +126,22 @@ def restart(inp, nick=None, conn=None):
 
 @hook.command(autohelp=False, permissions=["botcontrol"])
 def clearlogs(inp, input=None):
-    "clearlogs -- Clears the bots log(s)."
+    """clearlogs -- Clears the bots log(s)."""
     subprocess.call(["./cloudbot", "clear"])
 
 
 @hook.command(permissions=["botcontrol"])
 def join(inp, conn=None, notice=None):
-    "join <channel> -- Joins <channel>."
+    """join <channel> -- Joins <channel>."""
     notice("Attempting to join %s..." % inp)
     conn.join(inp)
 
 
 @hook.command(autohelp=False, permissions=["botcontrol"])
 def part(inp, conn=None, chan=None, notice=None):
-    "part <channel> -- Leaves <channel>." \
+    """part <channel> -- Leaves <channel>.
-    "If [channel] is blank the bot will leave the " \
+    If [channel] is blank the bot will leave the
-    "channel the command was used in."
+    channel the command was used in."""
     if inp:
         target = inp
     else:
@@ -150,9 +152,9 @@ def part(inp, conn=None, chan=None, notice=None):
 
 @hook.command(autohelp=False, permissions=["botcontrol"])
 def cycle(inp, conn=None, chan=None, notice=None):
-    "cycle <channel> -- Cycles <channel>." \
+    """cycle <channel> -- Cycles <channel>.
-    "If [channel] is blank the bot will cycle the " \
+    If [channel] is blank the bot will cycle the
-    "channel the command was used in."
+    channel the command was used in."""
     if inp:
         target = inp
     else:
@@ -163,8 +165,8 @@ def cycle(inp, conn=None, chan=None, notice=None):
 
 
 @hook.command(permissions=["botcontrol"])
-def nick(inp, input=None, notice=None, conn=None):
+def nick(inp, notice=None, conn=None):
-    "nick <nick> -- Changes the bots nickname to <nick>."
+    """nick <nick> -- Changes the bots nickname to <nick>."""
     if not re.match("^[A-Za-z0-9_|.-\]\[]*$", inp.lower()):
         notice("Invalid username!")
         return
@@ -174,38 +176,31 @@ def nick(inp, input=None, notice=None, conn=None):
 
 @hook.command(permissions=["botcontrol"])
 def raw(inp, conn=None, notice=None):
-    "raw <command> -- Sends a RAW IRC command."
+    """raw <command> -- Sends a RAW IRC command."""
     notice("Raw command sent.")
     conn.send(inp)
 
 
 @hook.command(permissions=["botcontrol"])
-def say(inp, conn=None, chan=None, notice=None):
+def say(inp, conn=None, chan=None):
-    "say [channel] <message> -- Makes the bot say <message> in [channel]. " \
+    """say [channel] <message> -- Makes the bot say <message> in [channel].
-    "If [channel] is blank the bot will say the <message> in the channel " \
+    If [channel] is blank the bot will say the <message> in the channel
-    "the command was used in."
+    the command was used in."""
     inp = inp.split(" ")
+    message = " ".join(inp[1:])
     if inp[0][0] == "#":
-        message = ""
-        for x in inp[1:]:
-            message = message + x + " "
-        message = message[:-1]
         out = "PRIVMSG %s :%s" % (inp[0], message)
     else:
-        message = ""
-        for x in inp[0:]:
-            message = message + x + " "
-        message = message[:-1]
         out = "PRIVMSG %s :%s" % (chan, message)
     conn.send(out)
 
 
 @hook.command("act", permissions=["botcontrol"])
 @hook.command(permissions=["botcontrol"])
-def me(inp, conn=None, chan=None, notice=None):
+def me(inp, conn=None, chan=None):
-    "me [channel] <action> -- Makes the bot act out <action> in [channel]. " \
+    """me [channel] <action> -- Makes the bot act out <action> in [channel].
-    "If [channel] is blank the bot will act the <action> in the channel the " \
+    If [channel] is blank the bot will act the <action> in the channel the
-    "command was used in."
+    command was used in."""
     inp = inp.split(" ")
     if inp[0][0] == "#":
         message = ""