diff --git a/plugins/admin.py b/plugins/admin.py index 7813b64..b90d4aa 100644 --- a/plugins/admin.py +++ b/plugins/admin.py @@ -1,4 +1,3 @@ -from util import hook import os import sys import re @@ -6,6 +5,8 @@ import json import time import subprocess +from util import hook + @hook.command(autohelp=False, permissions=["permissions_users"]) def permissions(inp, bot=None, notice=None): diff --git a/plugins/attacks.py b/plugins/attacks.py index 643a184..feb00b8 100644 --- a/plugins/attacks.py +++ b/plugins/attacks.py @@ -1,6 +1,8 @@ -from util import hook import random +from util import hook + + with open("plugins/data/larts.txt") as f: larts = [line.strip() for line in f.readlines() if not line.startswith("//")] diff --git a/plugins/coin.py b/plugins/coin.py index 104b3a7..7cc2a2a 100644 --- a/plugins/coin.py +++ b/plugins/coin.py @@ -1,6 +1,7 @@ -from util import hook import random +from util import hook + @hook.command(autohelp=False) def coin(inp, action=None): diff --git a/plugins/core_ctcp.py b/plugins/core_ctcp.py index 4f399f6..23834db 100644 --- a/plugins/core_ctcp.py +++ b/plugins/core_ctcp.py @@ -1,7 +1,9 @@ import time + from util import hook + # CTCP responses @hook.regex(r'^\x01VERSION\x01$') def ctcp_version(inp, notice=None): diff --git a/plugins/core_misc.py b/plugins/core_misc.py index bd71870..c1fafca 100644 --- a/plugins/core_misc.py +++ b/plugins/core_misc.py @@ -4,6 +4,7 @@ import re from util import hook + socket.setdefaulttimeout(10) nick_re = re.compile(":(.+?)!") diff --git a/plugins/core_sieve.py b/plugins/core_sieve.py index 4a6c809..9d41c54 100644 --- a/plugins/core_sieve.py +++ b/plugins/core_sieve.py @@ -1,7 +1,7 @@ import re +from fnmatch import fnmatch from util import hook -from fnmatch import fnmatch @hook.sieve diff --git a/plugins/cypher.py b/plugins/cypher.py index 55bea8c..b54248a 100644 --- a/plugins/cypher.py +++ b/plugins/cypher.py @@ -1,4 +1,5 @@ import base64 + from util import hook diff --git a/plugins/dictionary.py b/plugins/dictionary.py index ca74c36..b13db4b 100644 --- a/plugins/dictionary.py +++ b/plugins/dictionary.py @@ -1,5 +1,6 @@ # Plugin by GhettoWizard and Scaevolus import re + from util import hook from util import http diff --git a/plugins/drama.py b/plugins/drama.py index 351c5c8..d348cba 100644 --- a/plugins/drama.py +++ b/plugins/drama.py @@ -1,6 +1,8 @@ -from util import hook, http, text import re +from util import hook, http, text + + api_url = "http://encyclopediadramatica.se/api.php?action=opensearch" ed_url = "http://encyclopediadramatica.se/" diff --git a/plugins/eightball.py b/plugins/eightball.py index 0e039fb..8d91303 100644 --- a/plugins/eightball.py +++ b/plugins/eightball.py @@ -1,6 +1,8 @@ import random + from util import hook, text + color_codes = { "": "\x02\x0305", "": "\x02\x0303", diff --git a/plugins/encrypt.py b/plugins/encrypt.py index 7dccbf3..483ed48 100644 --- a/plugins/encrypt.py +++ b/plugins/encrypt.py @@ -1,13 +1,15 @@ -from util import hook -from Crypto import Random -from Crypto.Cipher import AES -from Crypto.Protocol.KDF import PBKDF2 - import os import base64 import json import hashlib +from Crypto import Random +from Crypto.Cipher import AES +from Crypto.Protocol.KDF import PBKDF2 + +from util import hook + + # helper functions to pad and unpad a string to a specified block size # BS = AES.block_size diff --git a/plugins/factoids.py b/plugins/factoids.py index 1d90e66..a924bf1 100644 --- a/plugins/factoids.py +++ b/plugins/factoids.py @@ -1,8 +1,10 @@ # Written by Scaevolus 2010 -from util import hook, http, text, pyexec import string import re +from util import hook, http, text, pyexec + + re_lineends = re.compile(r'[\r\n]*') # some simple "shortcodes" for formatting purposes diff --git a/plugins/fishbans.py b/plugins/fishbans.py index 7afe5e2..aa76676 100644 --- a/plugins/fishbans.py +++ b/plugins/fishbans.py @@ -1,6 +1,8 @@ -from util import hook, http from urllib import quote_plus +from util import hook, http + + api_url = "http://api.fishbans.com/stats/{}/" diff --git a/plugins/fortune.py b/plugins/fortune.py index c32efcb..5f1c478 100644 --- a/plugins/fortune.py +++ b/plugins/fortune.py @@ -1,6 +1,8 @@ -from util import hook import random +from util import hook + + with open("plugins/data/fortunes.txt") as f: fortunes = [line.strip() for line in f.readlines() if not line.startswith("//")] diff --git a/plugins/geoip.py b/plugins/geoip.py index a4fab57..172c90a 100644 --- a/plugins/geoip.py +++ b/plugins/geoip.py @@ -1,10 +1,13 @@ -from util import hook, http import os.path -import pygeoip import json import gzip from StringIO import StringIO +import pygeoip + +from util import hook, http + + # load region database with open("./plugins/data/geoip_regions.json", "rb") as f: diff --git a/plugins/github.py b/plugins/github.py index 025dc72..18033ef 100644 --- a/plugins/github.py +++ b/plugins/github.py @@ -1,7 +1,9 @@ -from util import hook, http import json import urllib2 +from util import hook, http + + shortcuts = {"cloudbot": "ClouDev/CloudBot"} diff --git a/plugins/google.py b/plugins/google.py index ebf6209..fe9e288 100644 --- a/plugins/google.py +++ b/plugins/google.py @@ -1,4 +1,5 @@ import random + from util import hook, http, text diff --git a/plugins/google_translate.py b/plugins/google_translate.py index 955cb53..a9d4ea3 100644 --- a/plugins/google_translate.py +++ b/plugins/google_translate.py @@ -8,6 +8,7 @@ import re from util import hook, http + max_length = 100 diff --git a/plugins/help.py b/plugins/help.py index 08001a5..805ab15 100644 --- a/plugins/help.py +++ b/plugins/help.py @@ -1,4 +1,5 @@ import re + from util import hook diff --git a/plugins/hulu.py b/plugins/hulu.py index 46d31ee..74e6b00 100644 --- a/plugins/hulu.py +++ b/plugins/hulu.py @@ -1,7 +1,9 @@ -from util import hook, http, timeformat from urllib import urlencode import re +from util import hook, http, timeformat + + hulu_re = (r'(.*://)(www.hulu.com|hulu.com)(.*)', re.I) diff --git a/plugins/ignore.py b/plugins/ignore.py index dc3f382..3bafbfb 100644 --- a/plugins/ignore.py +++ b/plugins/ignore.py @@ -1,7 +1,8 @@ import json -from util import hook from fnmatch import fnmatch +from util import hook + @hook.sieve def ignore_sieve(bot, input, func, type, args): diff --git a/plugins/imdb.py b/plugins/imdb.py index f7a0223..a577a9d 100644 --- a/plugins/imdb.py +++ b/plugins/imdb.py @@ -1,8 +1,10 @@ # IMDb lookup plugin by Ghetto Wizard (2011) and blha303 (2013) -from util import hook, http, text import re +from util import hook, http, text + + id_re = re.compile("tt\d+") imdb_re = (r'(.*:)//(imdb.com|www.imdb.com)(:[0-9]+)?(.*)', re.I) diff --git a/plugins/imgur.py b/plugins/imgur.py index 8db3b96..603f106 100644 --- a/plugins/imgur.py +++ b/plugins/imgur.py @@ -1,7 +1,8 @@ -from util import hook, http, web import re import random +from util import hook, http, web + base_url = "http://reddit.com/r/{}/.json" imgur_re = re.compile(r'http://(?:i\.)?imgur\.com/(a/)?(\w+\b(?!/))\.?\w?') diff --git a/plugins/kernel.py b/plugins/kernel.py index 7ade46e..90cbed5 100644 --- a/plugins/kernel.py +++ b/plugins/kernel.py @@ -1,6 +1,7 @@ -from util import hook, http import re +from util import hook, http + @hook.command(autohelp=False) def kernel(inp, reply=None): diff --git a/plugins/kill.py b/plugins/kill.py index d264682..d25228e 100644 --- a/plugins/kill.py +++ b/plugins/kill.py @@ -1,6 +1,7 @@ -from util import hook, textgen import json +from util import hook, textgen + def get_generator(_json, variables): data = json.loads(_json) diff --git a/plugins/lastfm.py b/plugins/lastfm.py index 4f56ee3..f126dbe 100644 --- a/plugins/lastfm.py +++ b/plugins/lastfm.py @@ -1,6 +1,8 @@ -from util import hook, http, timesince from datetime import datetime +from util import hook, http, timesince + + api_url = "http://ws.audioscrobbler.com/2.0/?format=json" diff --git a/plugins/minecraft_bukget.py b/plugins/minecraft_bukget.py index 1222020..352d5d8 100644 --- a/plugins/minecraft_bukget.py +++ b/plugins/minecraft_bukget.py @@ -1,7 +1,9 @@ -from util import hook, http, web, text import time import random +from util import hook, http, web, text + + ## CONSTANTS base_url = "http://api.bukget.org/3/" diff --git a/plugins/minecraft_items.py b/plugins/minecraft_items.py index 2031b14..f1e94f9 100644 --- a/plugins/minecraft_items.py +++ b/plugins/minecraft_items.py @@ -1,9 +1,11 @@ """ plugin by _303 (?) """ -from util import hook import re +from util import hook + + pattern = re.compile(r'^(?P\d+)x (?P.+?): (?P.*)$') recipelist = [] diff --git a/plugins/minecraft_ping.py b/plugins/minecraft_ping.py index d7693da..4ffb318 100644 --- a/plugins/minecraft_ping.py +++ b/plugins/minecraft_ping.py @@ -1,9 +1,11 @@ # TODO: Rewrite this whole mess -from util import hook import socket import struct import json +from util import hook + + try: import DNS # Please remember to install the dependancy 'pydns' diff --git a/plugins/minecraft_status.py b/plugins/minecraft_status.py index 98fce4a..8bb7e07 100644 --- a/plugins/minecraft_status.py +++ b/plugins/minecraft_status.py @@ -1,6 +1,7 @@ -from util import hook, http import json +from util import hook, http + @hook.command(autohelp=False) def mcstatus(inp): diff --git a/plugins/minecraft_wiki.py b/plugins/minecraft_wiki.py index 878f434..072a8ac 100644 --- a/plugins/minecraft_wiki.py +++ b/plugins/minecraft_wiki.py @@ -1,6 +1,8 @@ -from util import hook, http, text import re +from util import hook, http, text + + api_url = "http://minecraft.gamepedia.com/api.php?action=opensearch" mc_url = "http://minecraft.gamepedia.com/" diff --git a/plugins/mlia.py b/plugins/mlia.py index b44211b..feea642 100644 --- a/plugins/mlia.py +++ b/plugins/mlia.py @@ -1,6 +1,7 @@ # Plugin by Infinity - import random + from util import hook, http diff --git a/plugins/namegen.py b/plugins/namegen.py index 0a95f36..7a1f0e6 100644 --- a/plugins/namegen.py +++ b/plugins/namegen.py @@ -1,7 +1,8 @@ -from util import hook, text, textgen import json import os +from util import hook, text, textgen + GEN_DIR = "./plugins/data/name_files/" diff --git a/plugins/newegg.py b/plugins/newegg.py index 00271f8..68d604d 100644 --- a/plugins/newegg.py +++ b/plugins/newegg.py @@ -1,7 +1,9 @@ -from util import hook, http, text, web import json import re +from util import hook, http, text, web + + ## CONSTANTS ITEM_URL = "http://www.newegg.com/Product/Product.aspx?Item={}" diff --git a/plugins/newgrounds.py b/plugins/newgrounds.py index 7bfdb97..b26ffe4 100644 --- a/plugins/newgrounds.py +++ b/plugins/newgrounds.py @@ -1,6 +1,8 @@ import re + from util import hook, http + newgrounds_re = (r'(.*:)//(www.newgrounds.com|newgrounds.com)(:[0-9]+)?(.*)', re.I) valid = set('0123456789') diff --git a/plugins/notes.py b/plugins/notes.py index ac85f48..63a671c 100644 --- a/plugins/notes.py +++ b/plugins/notes.py @@ -1,6 +1,8 @@ -from util import hook import re +from util import hook + + db_inited = False diff --git a/plugins/osrc.py b/plugins/osrc.py index e2a2006..7df2085 100644 --- a/plugins/osrc.py +++ b/plugins/osrc.py @@ -1,6 +1,8 @@ -from util import hook, http, web from bs4 import BeautifulSoup +from util import hook, http, web + + api_url = "http://osrc.dfm.io/{}/stats" user_url = "http://osrc.dfm.io/{}" diff --git a/plugins/password.py b/plugins/password.py index 3fc6c45..34a379b 100644 --- a/plugins/password.py +++ b/plugins/password.py @@ -1,9 +1,10 @@ # TODO: Add some kind of pronounceable password generation # TODO: Improve randomness -from util import hook import string import random +from util import hook + @hook.command def password(inp, notice=None): diff --git a/plugins/ping.py b/plugins/ping.py index 14b8787..f5127d0 100644 --- a/plugins/ping.py +++ b/plugins/ping.py @@ -1,9 +1,11 @@ # ping plugin by neersighted -from util import hook import subprocess import re import os +from util import hook + + ping_regex = re.compile(r"(\d+.\d+)/(\d+.\d+)/(\d+.\d+)/(\d+.\d+)") diff --git a/plugins/potato.py b/plugins/potato.py index 05eb00b..dbef4ec 100644 --- a/plugins/potato.py +++ b/plugins/potato.py @@ -1,8 +1,10 @@ # coding=utf-8 -from util import hook import re import random +from util import hook + + potatoes = ['AC Belmont', 'AC Blue Pride', 'AC Brador', 'AC Chaleur', 'AC Domino', 'AC Dubuc', 'AC Glacier Chip', 'AC Maple Gold', 'AC Novachip', 'AC Peregrine Red', 'AC Ptarmigan', 'AC Red Island', 'AC Saguenor', 'AC Stampede Russet', 'AC Sunbury', 'Abeille', 'Abnaki', 'Acadia', 'Acadia Russet', 'Accent', diff --git a/plugins/pre.py b/plugins/pre.py index 0e443f9..f4e61a3 100644 --- a/plugins/pre.py +++ b/plugins/pre.py @@ -1,6 +1,7 @@ -from util import hook, http, timesince import datetime +from util import hook, http, timesince + @hook.command("scene") @hook.command diff --git a/plugins/rdio.py b/plugins/rdio.py index 6220a24..2677090 100644 --- a/plugins/rdio.py +++ b/plugins/rdio.py @@ -1,9 +1,11 @@ import urllib import json import re -from util import hook + import oauth2 as oauth +from util import hook + def getdata(inp, types, api_key, api_secret): consumer = oauth.Consumer(api_key, api_secret) diff --git a/plugins/seen.py b/plugins/seen.py index 29af742..85d433a 100644 --- a/plugins/seen.py +++ b/plugins/seen.py @@ -5,6 +5,7 @@ import re from util import hook, timesince + db_ready = False diff --git a/plugins/slap.py b/plugins/slap.py index 5371a0a..37dfbbd 100644 --- a/plugins/slap.py +++ b/plugins/slap.py @@ -1,6 +1,7 @@ -from util import hook, textgen import json +from util import hook, textgen + def get_generator(_json, variables): data = json.loads(_json) diff --git a/plugins/slogan.py b/plugins/slogan.py index 50ccbc1..279c41d 100644 --- a/plugins/slogan.py +++ b/plugins/slogan.py @@ -1,6 +1,7 @@ -from util import hook, text import random +from util import hook, text + with open("plugins/data/slogans.txt") as f: slogans = [line.strip() for line in f.readlines() diff --git a/plugins/soundcloud.py b/plugins/soundcloud.py index 034a2f5..d31f103 100644 --- a/plugins/soundcloud.py +++ b/plugins/soundcloud.py @@ -1,7 +1,9 @@ -from util import hook, http, web, text from urllib import urlencode import re +from util import hook, http, web, text + + sc_re = (r'(.*:)//(www.)?(soundcloud.com)(.*)', re.I) api_url = "http://api.soundcloud.com" sndsc_re = (r'(.*:)//(www.)?(snd.sc)(.*)', re.I) diff --git a/plugins/spellcheck.py b/plugins/spellcheck.py index 7ab188d..1630a0d 100644 --- a/plugins/spellcheck.py +++ b/plugins/spellcheck.py @@ -1,8 +1,9 @@ -from util import hook from enchant.checker import SpellChecker - import enchant +from util import hook + + locale = "en_US" diff --git a/plugins/spotify.py b/plugins/spotify.py index c113a06..ae0b339 100644 --- a/plugins/spotify.py +++ b/plugins/spotify.py @@ -1,7 +1,7 @@ import re +from urllib import urlencode from util import hook, http, web -from urllib import urlencode gateway = 'http://open.spotify.com/{}/{}' # http spotify gw address spuri = 'spotify:{}:{}' diff --git a/plugins/steam.py b/plugins/steam.py index cb7b9d5..3bc06c2 100644 --- a/plugins/steam.py +++ b/plugins/steam.py @@ -1,7 +1,9 @@ import re + +from bs4 import BeautifulSoup, NavigableString, Tag + from util import hook, http, web from util.text import truncate_str -from bs4 import BeautifulSoup, NavigableString, Tag steam_re = (r'(.*:)//(store.steampowered.com)(:[0-9]+)?(.*)', re.I) diff --git a/plugins/steam_calc.py b/plugins/steam_calc.py index 2fe2825..2aef985 100644 --- a/plugins/steam_calc.py +++ b/plugins/steam_calc.py @@ -1,7 +1,9 @@ -from util import hook, http, text import csv import StringIO +from util import hook, http, text + + gauge_url = "http://www.mysteamgauge.com/search?username={}" api_url = "http://mysteamgauge.com/user/{}.csv" diff --git a/plugins/system.py b/plugins/system.py index e8489d1..08891fd 100644 --- a/plugins/system.py +++ b/plugins/system.py @@ -2,9 +2,10 @@ import os import re import time import platform -from util import hook from datetime import timedelta +from util import hook + def convert_kilobytes(kilobytes): if kilobytes >= 1024: diff --git a/plugins/time_plugin.py b/plugins/time_plugin.py index 93dd2f2..885208b 100644 --- a/plugins/time_plugin.py +++ b/plugins/time_plugin.py @@ -1,7 +1,9 @@ -from util import hook, http import time + +from util import hook, http from util.text import capitalize_first + api_url = 'http://api.wolframalpha.com/v2/query?format=plaintext' diff --git a/plugins/title.py b/plugins/title.py index 6b912a3..4264188 100644 --- a/plugins/title.py +++ b/plugins/title.py @@ -1,6 +1,7 @@ -from util import hook, http, urlnorm from bs4 import BeautifulSoup +from util import hook, http, urlnorm + @hook.command def title(inp): diff --git a/plugins/tvdb.py b/plugins/tvdb.py index fa7584c..6a78502 100644 --- a/plugins/tvdb.py +++ b/plugins/tvdb.py @@ -9,6 +9,7 @@ from zipfile import ZipFile from cStringIO import StringIO from lxml import etree + from util import hook, http diff --git a/plugins/twitch.py b/plugins/twitch.py index 3e4e248..7e1a56a 100644 --- a/plugins/twitch.py +++ b/plugins/twitch.py @@ -1,7 +1,9 @@ import re -from util import hook, http from HTMLParser import HTMLParser +from util import hook, http + + twitch_re = (r'(.*:)//(twitch.tv|www.twitch.tv)(:[0-9]+)?(.*)', re.I) multitwitch_re = (r'(.*:)//(www.multitwitch.tv|multitwitch.tv)/(.*)', re.I) diff --git a/plugins/twitter.py b/plugins/twitter.py index 1499470..1983cef 100644 --- a/plugins/twitter.py +++ b/plugins/twitter.py @@ -1,9 +1,12 @@ -from util import hook, timesince -import tweepy import re import random from datetime import datetime +import tweepy + +from util import hook, timesince + + TWITTER_RE = (r"(?:(?:www.twitter.com|twitter.com)/(?:[-_a-zA-Z0-9]+)/status/)([0-9]+)", re.I) diff --git a/plugins/urban.py b/plugins/urban.py index 7374145..e64ea80 100644 --- a/plugins/urban.py +++ b/plugins/urban.py @@ -1,6 +1,8 @@ -from util import hook, http, text import re +from util import hook, http, text + + base_url = 'http://www.urbandictionary.com/iphone/search/define' diff --git a/plugins/utility.py b/plugins/utility.py index c0a1659..6a558f6 100644 --- a/plugins/utility.py +++ b/plugins/utility.py @@ -1,8 +1,10 @@ -from util import hook, text import hashlib import collections import re +from util import hook, text + + # variables colors = collections.OrderedDict([ diff --git a/plugins/valvesounds.py b/plugins/valvesounds.py index d8a9842..88bc8ce 100644 --- a/plugins/valvesounds.py +++ b/plugins/valvesounds.py @@ -1,7 +1,8 @@ -from util import hook, http, web import json import urllib2 +from util import hook, http, web + def get_sound_info(game, search): search = search.replace(" ", "+")