PEP8, various other tweaks

plugins/admin.py

@@ -1,8 +1,6 @@
-# Plugin made by iloveportalz0r, TheNoodle, Lukeroge and neersighted
 from util import hook
 import os
 import re
-import sys
 import json
 import time
 import subprocess

plugins/fortune.py

@@ -1,5 +1,4 @@
 from util import hook
-import re
 import random
 
 with open("plugins/data/fortunes.txt") as f:

plugins/gcalc.py

@@ -1,6 +1,4 @@
-import re
+from util import hook, http
-
-from util import hook, http, misc
 from bs4 import BeautifulSoup
 
 

plugins/help.py

@@ -26,7 +26,6 @@ def help(inp, say=None, notice=None, input=None, conn=None, bot=None):
     commands = dict((value, key) for key, value in funcs.iteritems())
 
     if not inp:
-        length = 0
         out = ["", ""]
         well = []
         for x in commands:
@@ -41,8 +40,8 @@ def help(inp, say=None, notice=None, input=None, conn=None, bot=None):
         notice("Commands I recognise: " + out[0][1:])
         if out[1]:
             notice(out[1][1:])
-        notice("For detailed help, do '.help <example>' where <example> "\
+        notice("For detailed help, do '%shelp <example>' where <example> "\
-               "is the name of the command you want help for.")
+               "is the name of the command you want help for." % conn.conf["command_prefix"])
 
     else:
         if inp in commands:

plugins/lastfm.py

@@ -1,22 +1,24 @@
 from util import hook, http, timesince
 from datetime import datetime
 
+api_url = "http://ws.audioscrobbler.com/2.0/?format=json"
+
+
 @hook.command('l', autohelp=False)
 @hook.command(autohelp=False)
-def lastfm(inp, nick='', say=None, db=None, bot=None):
+def lastfm(inp, nick='', say=None, db=None, bot=None, notice=None):
     "lastfm [user] [dontsave] -- Displays the now playing (or last played)" \
     " track of LastFM user [user]."
     api_key = bot.config.get("api_keys", {}).get("lastfm")
     if not api_key:
         return "error: no api key set"
 
-    user = inp		
+    # check if the user asked us not to save his details
-	
+    dontsave = inp.endswith(" dontsave")
-    api_url = "http://ws.audioscrobbler.com/2.0/?format=json"
-
-    dontsave = user.endswith(" dontsave")
     if dontsave:
-        user = user[:-9].strip().lower()
+        user = inp[:-9].strip().lower()
+    else:
+        user = inp
 
     db.execute("create table if not exists lastfm(nick primary key, acc)")
 

plugins/lmgtfy.py

@@ -1,7 +1,4 @@
-
+from util import hook, web, http
-from util import hook
-from util.web import isgd
-from urllib import quote_plus
 
 
 @hook.command('gfy')
@@ -9,5 +6,5 @@ from urllib import quote_plus
 def lmgtfy(inp, bot=None):
     "lmgtfy [phrase] - Posts a google link for the specified phrase"
 
-    url = "http://lmgtfy.com/?q=%s" % quote_plus(inp)
+    url = "http://lmgtfy.com/?q=%s" % http.quote_plus(inp)
-    return isgd(url, api_user, api_key)
+    return web.isgd(url)

plugins/util/text.py

@@ -104,8 +104,10 @@ def get_text_list(list_, last_word='or'):
     >>> get_text_list([])
     u''
     """
-    if len(list_) == 0: return ''
+    if len(list_) == 0:
-    if len(list_) == 1: return list_[0]
+        return ''
+    if len(list_) == 1:
+        return list_[0]
     return '%s %s %s' % (
         # Translators: This string is used as a separator between list elements
         (', ').join([i for i in list_][:-1]),