From cda99f1852e6fe7d78a9b00299174618fb4c12b7 Mon Sep 17 00:00:00 2001
From: Luke Rogers <lukeroge@gmail.com>
Date: Wed, 11 Dec 2013 17:31:57 +1300
Subject: [PATCH] tweaks

---
 plugins/{minecraft_bukkit.py => minecraft_bukget.py} | 6 +++---
 plugins/newegg.py                                    | 4 ++++
 plugins/util/timeformat.py                           | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename plugins/{minecraft_bukkit.py => minecraft_bukget.py} (97%)

diff --git a/plugins/minecraft_bukkit.py b/plugins/minecraft_bukget.py
similarity index 97%
rename from plugins/minecraft_bukkit.py
rename to plugins/minecraft_bukget.py
index c72b0e5..c066c74 100644
--- a/plugins/minecraft_bukkit.py
+++ b/plugins/minecraft_bukget.py
@@ -107,9 +107,9 @@ def format_output(data):
 ## HOOK FUNCTIONS
 
 @hook.command('plugin')
-@hook.command
-def bukkitplugin(inp, reply=None, message=None):
-    """plugin <slug/name> - Look up a plugin on dev.bukkit.org"""
+@hook.commands
+def bukget(inp, reply=None, message=None):
+    """bukget <slug/name> - Look up a plugin on dev.bukkit.org"""
     # get the plugin slug using search
     try:
         slug = plugin_search(inp)
diff --git a/plugins/newegg.py b/plugins/newegg.py
index bd07a47..87242dc 100644
--- a/plugins/newegg.py
+++ b/plugins/newegg.py
@@ -2,6 +2,8 @@ from util import hook, http, text, web
 import json
 import re
 
+## CONSTANTS
+
 ITEM_URL = "http://www.newegg.com/Product/Product.aspx?Item={}"
 
 API_PRODUCT = "http://www.ows.newegg.com/Products.egg/{}/ProductDetails"
@@ -10,6 +12,8 @@ API_SEARCH = "http://www.ows.newegg.com/Search.egg/Advanced"
 NEWEGG_RE = (r"(?:(?:www.newegg.com|newegg.com)/Product/Product\.aspx\?Item=)([-_a-zA-Z0-9]+)", re.I)
 
 
+## OTHER FUNCTIONS
+
 def format_item(item, show_url=True):
     """ takes a newegg API item object and returns a description """
     title = text.truncate_str(item["Title"], 50)
diff --git a/plugins/util/timeformat.py b/plugins/util/timeformat.py
index ebfe333..7ec6abf 100644
--- a/plugins/util/timeformat.py
+++ b/plugins/util/timeformat.py
@@ -7,7 +7,7 @@ def format_time(seconds, count=3, accuracy=6, simple=False):
 
     SIMPLE: displays the time in a simple format
     >>> format_time(SECONDS)
-    1 hour, 2 minutes, and 34 seconds
+    1 hour, 2 minutes and 34 seconds
     >>> format_time(SECONDS, simple=True)
     1h 2m 34s