HUGE code cleanup

1 files changed, 12 insertions, 8 deletions

diff --git a/saylol.py b/saylol.py
index 190ef9c..e1fddd9 100644
--- a/saylol.py
+++ b/saylol.py
@@ -1,5 +1,4 @@
 import simplejson as json
-import org.bukkit as bukkit
 from time import time
 from helpers import *
 from random import randrange
@@ -28,15 +27,15 @@ def add_lol(txt):
   lols.append(txt)
   save_lols()
 
-def del_lol(id):
-  lols.pop(id)
+def del_lol(lid):
+  lols.pop(lid)
   save_lols()
 
-def print_lol(sender, id):
+def print_lol(sender, lid):
   global last_msg
   if time() - last_msg > timeout:
     dispname = sender.getDisplayName() if isPlayer(sender) else sender.getName()
-    broadcast("", "&8[&blol&8] &7%s&8: &e%s" % (dispname, lols[id]))
+    broadcast("", "&8[&blol&8] &7%s&8: &e%s" % (dispname, lols[lid]))
     last_msg = time()
   else:
     plugHeader(sender, "SayLol")
@@ -44,27 +43,30 @@ def print_lol(sender, id):
 
 
 @hook.command("lol")
-def onCommand(sender, args):
+def onLolCommand(sender, args):
   cmd = args[0] if len(args) > 0 else None
   if len(args) == 0:
     if sender.hasPermission("utils.lol"):
       print_lol(sender, randrange(len(lols)))
     else:
       noperm(sender)
+
   elif cmd == "id":
     if sender.hasPermission("utils.lol.id"):
       try:
         i = int(args[1])
         print_lol(sender, i)
-      except Exception, e:
+      except ValueError:
         plugHeader(sender, "SayLol")
         msg(sender, "&cInvalid number '&e%s&c'" % args[1])
     else:
       noperm(sender)
+
   elif cmd == "list":
     plugHeader(sender, "SayLol")
     for i in range(len(lols)):
       msg(sender, "&a%s: &e%s" % (str(i).rjust(3), lols[i]))
+
   elif cmd == "add":
     if sender.hasPermission("utils.lol.modify"):
       plugHeader(sender, "SayLol")
@@ -72,6 +74,7 @@ def onCommand(sender, args):
       msg(sender, "&aNew lol message added!")
     else:
       noperm(sender)
+
   elif cmd == "del":
     if sender.hasPermission("utils.lol.modify"):
       plugHeader(sender, "SayLol")
@@ -79,8 +82,9 @@ def onCommand(sender, args):
         i = int(args[1])
         del_lol(i)
         msg(sender, "&aLol message &e#%s&a deleted!" % i)
-      except Exception, e:
+      except ValueError:
         msg(sender, "&cInvalid number '&e%s&c'" % args[1])
+
   else:
     plugHeader(sender, "SayLol")
     msg(sender, "&a/lol            &eSay random message")