moar PEP8

plugins/admin.py

@@ -123,7 +123,8 @@ def kick(inp, input=None, notice=None):
 @hook.command
 def say(inp, input=None, notice=None):
     ".say [channel] <message> -- Makes the bot say <message> in [channel]. "\
-    "If [channel] is blank the bot will say the <message> in the channel the command was used in."
+    "If [channel] is blank the bot will say the <message> in "\
+    "the channel the command was used in."
     if not input.nick in input.bot.config["admins"]:
         notice("Only bot admins can use this command!")
         return
@@ -146,8 +147,9 @@ def say(inp, input=None, notice=None):
 @hook.command("me")
 @hook.command
 def act(inp, input=None, notice=None):
-    ".act [channel] <action> -- Makes the bot act out <action> in [channel]. "
-    \"If [channel] is blank the bot will act the <action> in the channel the command was used in."
+    ".act [channel] <action> -- Makes the bot act out <action> in [channel] "\
+    "If [channel] is blank the bot will act the <action> in "\
+    "the channel the command was used in."
     if not input.nick in input.bot.config["admins"]:
         notice("Only bot admins can use this command!")
         return

plugins/choose.py

@@ -6,7 +6,8 @@ from util import hook
 
 @hook.command
 def choose(inp):
-    ".choose <choice1>, [choice2], [choice3], [choice4], ... -- Randomly picks one of the given choices."
+    ".choose <choice1>, [choice2], [choice3], [choice4], ... -- "\
+    "Randomly picks one of the given choices."
 
     c = re.findall(r'([^,]+)', inp)
     if len(c) == 1:

plugins/coin.py

@@ -2,24 +2,25 @@
 from util import hook
 import random
 
+
 # used for tails: x heads: y
 def flip_simple(count):
     heads = 0
     tails = 0
     for x in range(count):
-        c = random.randint(0,1)
+        c = random.randint(0, 1)
         if c == 0:
             heads += 1
         else:
             tails += 1
-    return [heads,tails]
+    return [heads, tails]
 
 
 @hook.command(autohelp=False)
 def coin(inp):
     ".coin [amount] -- Flips [amount] of coins."
-    
-    # checking for valid input. if valid input [count=inp], if invalid [return error], if no input [count=1]
+    # checking for valid input. if valid input [count=inp],
+    # if invalid [return error], if no input [count=1]
     if inp.isdigit():
         count = int(inp)
     else:
@@ -32,13 +33,13 @@ def coin(inp):
         return "Too many coins! Maximum is 200."
     # depending on the count, we use two different methods to get the output
     if count == 1:
-        flip = random.randint(0,1)
+        flip = random.randint(0, 1)
         if flip == 1:
             sidename = "heads"
         else:
             sidename = "tails"
-        return "You flip a coin and get "+sidename+"."
+        return "You flip a coin and get " + sidename + "."
     else:
         flips = flip_simple(count)
-        return "You flip %s coins and get %s heads and %s tails." % (str(count), str(flips[0]), str(flips[1]))
-
+        return "You flip %s coins and get "\
+        "%s heads and %s tails." % (str(count), str(flips[0]), str(flips[1]))

plugins/ctcp.py

@@ -1,19 +1,22 @@
 from util import hook
 
+
 # CTCP responses
 @hook.regex(r'^\x01VERSION\x01$')
 def ctcpversion(inp, notice=None):
     notice('\x01VERSION: CloudBot - http://git.io/cloudbot')
 
+
 @hook.regex(r'^\x01PING\x01$')
 def ctcpping(inp, notice=None):
     notice('\x01PING: PONG')
 
+
 @hook.regex(r'^\x01TIME\x01$')
 def ctcptime(inp, notice=None):
     notice('\x01TIME: GET A WATCH')
 
+
 @hook.regex(r'^\x01FINGER\x01$')
 def ctcpfinger(inp, notice=None):
     notice('\x01FINGER: WHERE ARE YOU PUTTING THAT')
-

plugins/cypher.py

@@ -1,15 +1,14 @@
 '''
 Plugin which (de)cyphers a string
-
 Doesn't cypher non-alphanumeric strings yet.
-
 by instanceoftom
 '''
 
 from util import hook
-chars="abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ "
+chars = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ "
 len_chars = len(chars)
 
+
 @hook.command
 def cypher(inp):
     ".cypher <pass> <string> -- Cyphers <string> with <password>."
@@ -18,8 +17,8 @@ def cypher(inp):
     len_passwd = len(passwd)
     inp = " ".join(inp.split(" ")[1:])
 
-	out =""
-	passwd_index=0
+    out = ""
+    passwd_index = 0
     for character in inp:
         try:
             chr_index = chars.index(character)
@@ -30,13 +29,13 @@ def cypher(inp):
 
             out += out_chr
 
-			passwd_index = ( passwd_index + 1) % len_passwd
+            passwd_index = (passwd_index + 1) % len_passwd
         except ValueError:
             out += character
             continue
-
     return out
 
+
 @hook.command
 def decypher(inp):
     ".decypher <pass> <string> -- Decyphers <string> with <password>."
@@ -45,21 +44,18 @@ def decypher(inp):
     len_passwd = len(passwd)
     inp = " ".join(inp.split(" ")[1:])
 
-
-	passwd_index=0
-	#I am lazy and I could do the math to get the passwd_index
-	#for this inp, but meh thats for a later day so lets loop.
+    passwd_index = 0
     for character in inp:
         try:
             chr_index = chars.index(character)
-			passwd_index = ( passwd_index + 1) % len_passwd
+            passwd_index = (passwd_index + 1) % len_passwd
         except ValueError:
             continue
 
-	passwd_index = passwd_index-1
+    passwd_index = passwd_index - 1
     reversed_message = inp[::-1]
 
-	out =""
+    out = ""
     for character in reversed_message:
         try:
             chr_index = chars.index(character)
@@ -70,7 +66,7 @@ def decypher(inp):
 
             out += out_chr
 
-			passwd_index = ( passwd_index - 1) % len_passwd
+            passwd_index = (passwd_index - 1) % len_passwd
         except ValueError:
             out += character
             continue