200->150

Author: pefoley2

.style.yapf

@@ -1,3 +1,3 @@
 [style]
   based_on_style = google
-  column_limit = 200
+  column_limit = 150

cslbot/commands/about.py

@@ -25,4 +25,5 @@ def cmd(send, _, args):
     Syntax: {command}
 
     """
-    send("See https://github.com/%s Developed by the TJHSST CSL. Type %shelp for a list of commands." % (args['config']['api']['githubrepo'], args['config']['core']['cmdchar']))
+    send("See https://github.com/%s Developed by the TJHSST CSL. Type %shelp for a list of commands." %
+         (args['config']['api']['githubrepo'], args['config']['core']['cmdchar']))

cslbot/commands/babble.py

@@ -41,7 +41,8 @@ def weighted_next(data):
 def build_msg(cursor, speaker, length, start):
     table = Babble if length == 1 else Babble2
     location = 'target' if speaker.startswith(('#', '+', '@')) else 'source'
-    count = cursor.query(Babble_count.count).filter(Babble_count.type == location, Babble_count.length == length, Babble_count.key == speaker).scalar()
+    count = cursor.query(Babble_count.count).filter(Babble_count.type == location, Babble_count.length == length,
+                                                    Babble_count.key == speaker).scalar()
     if count is None:
         return "%s hasn't said anything =(" % speaker
     if start is None:

cslbot/commands/choose.py

@@ -31,6 +31,6 @@ def cmd(send, msg, args):
         send("Choose what?")
         return
     choices = msg.split(' or ')
-    action = ['draws a slip of paper from a hat and gets...', 'says eenie, menie, miney, moe and chooses...', 'picks a random number and gets...', 'rolls dice and gets...',
-              'asks a random person and gets...', 'plays rock, paper, scissors, lizard, spock and gets...']
+    action = ['draws a slip of paper from a hat and gets...', 'says eenie, menie, miney, moe and chooses...', 'picks a random number and gets...',
+              'rolls dice and gets...', 'asks a random person and gets...', 'plays rock, paper, scissors, lizard, spock and gets...']
     send("%s %s" % (choice(action), choice(choices)), 'action')

cslbot/commands/ebay.py

@@ -34,8 +34,9 @@ def get_categories(apikey):
 
 def get_item(category, apikey):
     url = 'http://svcs.ebay.com/services/search/FindingService/v1?'
-    params = [('itemFilter(0).name', 'FreeShippingOnly'), ('itemFilter(0).value', 'true'), ('itemFilter(1).name', 'MaxPrice'), ('itemFilter(1).value', '1'), ('itemFilter(1).paramName', 'Currency'),
-              ('itemFilter(1).paramValue', 'USD'), ('itemFilter(2).name', 'ListingType'), ('itemFilter(2).value(0)', 'StoreInventory'), ('itemFilter(2).value(1)', 'FixedPrice'),
+    params = [('itemFilter(0).name', 'FreeShippingOnly'), ('itemFilter(0).value', 'true'), ('itemFilter(1).name', 'MaxPrice'),
+              ('itemFilter(1).value', '1'), ('itemFilter(1).paramName', 'Currency'), ('itemFilter(1).paramValue', 'USD'),
+              ('itemFilter(2).name', 'ListingType'), ('itemFilter(2).value(0)', 'StoreInventory'), ('itemFilter(2).value(1)', 'FixedPrice'),
               ('itemFilter(2).value(2)', 'AuctionWithBIN'), ('categoryId', category)]
     # If we use params=, requests will urlencode the (), making ebay very sad.
     url += "&".join("%s=%s" % x for x in params)

cslbot/commands/highlight.py

@@ -40,8 +40,9 @@ def cmd(send, msg, args):
         return
     target = cmdargs.channels[0] if hasattr(cmdargs, 'channels') else args['target']
     row = args['db'].query(Log).filter(
-        Log.msg.ilike("%%%s%%" % cmdargs.nick), ~Log.msg.contains('%shighlight' % args['config']['core']['cmdchar']), Log.target == target, Log.source != args['botnick'], Log.source != cmdargs.nick,
-        (Log.type == 'pubmsg') | (Log.type == 'privmsg') | (Log.type == 'action')).order_by(Log.time.desc()).first()
+        Log.msg.ilike("%%%s%%" % cmdargs.nick), ~Log.msg.contains('%shighlight' % args['config']['core']['cmdchar']), Log.target == target,
+        Log.source != args['botnick'], Log.source != cmdargs.nick, (Log.type == 'pubmsg') | (Log.type == 'privmsg') |
+        (Log.type == 'action')).order_by(Log.time.desc()).first()
     if row is None:
         send("%s has never been pinged." % cmdargs.nick)
     else:

cslbot/commands/issue.py

@@ -84,7 +84,8 @@ def cmd(send, msg, args):
         row = Issues(title=cmdargs.title, description=cmdargs.description, source=str(args['source']))  # str needed to make mysqlconnector happy
         args['db'].add(row)
         args['db'].flush()
-        send("New Issue: #%d -- %s -- %s, Submitted by %s" % (row.id, cmdargs.title, cmdargs.description, args['nick']), target=args['config']['core']['ctrlchan'])
+        send("New Issue: #%d -- %s -- %s, Submitted by %s" % (row.id, cmdargs.title, cmdargs.description, args['nick']),
+             target=args['config']['core']['ctrlchan'])
         send("Issue submitted for approval.", target=args['nick'])
     else:
         send("Invalid arguments.")

cslbot/commands/jargon.py

@@ -19,19 +19,20 @@
 
 from ..helpers.command import Command
 
-abbrev = ["TCP", "HTTP", "SDD", "RAM", "GB", "CSS", "SSL", "AGP", "SQL", "FTP", "PCI", "AI", "ADP", "RSS", "XML", "EXE", "COM", "HDD", "THX", "SMTP", "SMS", "USB", "PNG"]
+abbrev = ["TCP", "HTTP", "SDD", "RAM", "GB", "CSS", "SSL", "AGP", "SQL", "FTP", "PCI", "AI", "ADP", "RSS", "XML", "EXE", "COM", "HDD", "THX", "SMTP",
+          "SMS", "USB", "PNG"]
 
-adj = ["auxiliary", "primary", "back-end", "digital", "open-source", "virtual", "cross-platform", "redundant", "online", "haptic", "multi-byte", "bluetooth", "wireless", "1080p", "neural", "optical",
-       "solid state", "mobile"]
+adj = ["auxiliary", "primary", "back-end", "digital", "open-source", "virtual", "cross-platform", "redundant", "online", "haptic", "multi-byte",
+       "bluetooth", "wireless", "1080p", "neural", "optical", "solid state", "mobile"]
 
-noun = ["driver", "protocol", "bandwidth", "panel", "microchip", "program", "port", "card", "array", "interface", "system", "sensor", "firewall", "hard drive", "pixel", "alarm", "feed", "monitor",
-        "application", "transmitter", "bus", "circuit", "capacitor", "matrix"]
+noun = ["driver", "protocol", "bandwidth", "panel", "microchip", "program", "port", "card", "array", "interface", "system", "sensor", "firewall",
+        "hard drive", "pixel", "alarm", "feed", "monitor", "application", "transmitter", "bus", "circuit", "capacitor", "matrix"]
 
-verb = ["back up", "bypass", "hack", "override", "compress", "copy", "navigate", "index", "connect", "generate", "quantify", "calculate", "synthesize", "input", "transmit", "program", "reboot",
-        "parse"]
+verb = ["back up", "bypass", "hack", "override", "compress", "copy", "navigate", "index", "connect", "generate", "quantify", "calculate",
+        "synthesize", "input", "transmit", "program", "reboot", "parse"]
 
-ingverb = ["backing up", "bypassing", "hacking", "overriding", "compressing", "copying", "navigating", "indexing", "connecting", "generating", "quantifying", "calculating", "synthesizing",
-           "transmitting", "programming", "parsing"]
+ingverb = ["backing up", "bypassing", "hacking", "overriding", "compressing", "copying", "navigating", "indexing", "connecting", "generating",
+           "quantifying", "calculating", "synthesizing", "transmitting", "programming", "parsing"]
 
 
 @Command('jargon')
@@ -41,11 +42,14 @@ def cmd(send, *_):
     Syntax: {command}
 
     """
-    words = [[verb, noun, abbrev, noun, adj, abbrev, noun], [verb, adj, abbrev, noun], [verb, abbrev, noun, verb, adj, noun], [verb, noun, ingverb, adj, abbrev, noun],
-             [adj, abbrev, noun, verb, adj, noun], [abbrev, noun, verb, adj, noun, verb, abbrev, noun], [ingverb, noun, verb, adj, abbrev, noun], [verb, adj, abbrev, noun, verb, abbrev, noun]]
-    msgtype = ["If we %s the %s, we can get to the %s %s through the %s %s %s!" % tuple(map(choice, words[0])), "We need to %s the %s %s %s!" % tuple(map(choice, words[1])),
-               "Try to %s the %s %s, maybe it will %s the %s %s!" % tuple(map(choice, words[2])), "You can't %s the %s without %s the %s %s %s!" % tuple(map(choice, words[3])),
-               "Use the %s %s %s, then you can %s the %s %s!" % tuple(map(choice, words[4])), "The %s %s is down, %s the %s %s so we can %s the %s %s!" % tuple(map(choice, words[5])),
-               "%s the %s won't do anything, we need to %s the %s %s %s!" % tuple(map(choice, words[6])), "I'll %s the %s %s %s, that should %s the %s %s!" % tuple(map(choice, words[7]))]
+    words = [[verb, noun, abbrev, noun, adj, abbrev, noun], [verb, adj, abbrev, noun], [verb, abbrev, noun, verb, adj, noun],
+             [verb, noun, ingverb, adj, abbrev, noun], [adj, abbrev, noun, verb, adj, noun], [abbrev, noun, verb, adj, noun, verb, abbrev, noun],
+             [ingverb, noun, verb, adj, abbrev, noun], [verb, adj, abbrev, noun, verb, abbrev, noun]]
+    msgtype = ["If we %s the %s, we can get to the %s %s through the %s %s %s!" % tuple(map(choice, words[0])), "We need to %s the %s %s %s!" %
+               tuple(map(choice, words[1])), "Try to %s the %s %s, maybe it will %s the %s %s!" % tuple(map(choice, words[2])),
+               "You can't %s the %s without %s the %s %s %s!" % tuple(map(choice, words[3])), "Use the %s %s %s, then you can %s the %s %s!" %
+               tuple(map(choice, words[4])), "The %s %s is down, %s the %s %s so we can %s the %s %s!" % tuple(map(choice, words[5])),
+               "%s the %s won't do anything, we need to %s the %s %s %s!" % tuple(map(choice, words[6])),
+               "I'll %s the %s %s %s, that should %s the %s %s!" % tuple(map(choice, words[7]))]
 
     send(choice(msgtype))

cslbot/commands/line.py

@@ -44,7 +44,9 @@ def cmd(send, msg, args):
     else:
         quote = quote.filter(Log.source != args['botnick'])
     target = cmdargs.channels[0] if hasattr(cmdargs, 'channels') else args['config']['core']['channel']
-    quote = quote.filter(or_(Log.type == 'pubmsg', Log.type == 'privmsg', Log.type == 'action'), Log.target == target, func.length(Log.msg) > 5).order_by(func.random()).first()
+    quote = quote.filter(
+        or_(Log.type == 'pubmsg', Log.type == 'privmsg',
+            Log.type == 'action'), Log.target == target, func.length(Log.msg) > 5).order_by(func.random()).first()
     if quote:
         send("%s -- %s" % quote)
     elif nick:

cslbot/commands/s.py

@@ -26,7 +26,8 @@
 
 
 def get_log(conn, target, user):
-    query = conn.query(Log).filter((Log.type == 'privmsg') | (Log.type == 'pubmsg') | (Log.type == 'action'), Log.target == target).order_by(Log.time.desc())
+    query = conn.query(Log).filter(
+        (Log.type == 'privmsg') | (Log.type == 'pubmsg') | (Log.type == 'action'), Log.target == target).order_by(Log.time.desc())
     if user is None:
         return query.offset(1).limit(500).all()
     else:

cslbot/commands/seen.py

@@ -23,7 +23,8 @@
 
 def get_last(cursor, cmdchar, ctrlchan, nick):
     command = '%sseen %s' % (cmdchar, nick)
-    return cursor.query(Log).filter(Log.source.ilike(nick), Log.target != ctrlchan, Log.msg != command, Log.type != 'join').order_by(Log.time.desc()).first()
+    return cursor.query(Log).filter(
+        Log.source.ilike(nick), Log.target != ctrlchan, Log.msg != command, Log.type != 'join').order_by(Log.time.desc()).first()
 
 
 @Command('seen', ['db', 'config'])

cslbot/commands/stock.py

@@ -31,7 +31,8 @@ def gen_stock(msg):
         changepercent = "%.3f%%" % quote['ChangePercent']
         if quote['ChangePercent'] >= 0:
             changepercent = '+' + changepercent
-        return "%s (%s) as of %s: %s %s High: %s Low: %s" % (quote['Name'], msg, quote['Timestamp'], quote['LastPrice'], changepercent, quote['High'], quote['Low'])
+        return "%s (%s) as of %s: %s %s High: %s Low: %s" % (quote['Name'], msg, quote['Timestamp'], quote['LastPrice'], changepercent, quote['High'],
+                                                             quote['Low'])
 
 
 def random_stock():

cslbot/commands/tumblr.py

@@ -51,7 +51,12 @@ def cmd(send, msg, args):
             return
         # No random post functionality and we can only get 20 posts per API call, so pick a random offset to get the random post
         offset = randint(0, postcount - 1)
-        response = get('https://api.tumblr.com/v2/blog/%s/posts' % cmdargs.blogname, params={'api_key': apikey, 'offset': offset, 'limit': 1, 'type': 'text', 'filter': 'text'}).json()
+        response = get('https://api.tumblr.com/v2/blog/%s/posts' % cmdargs.blogname,
+                       params={'api_key': apikey,
+                               'offset': offset,
+                               'limit': 1,
+                               'type': 'text',
+                               'filter': 'text'}).json()
         entry = response['response']['posts'][0]['body']
         # Account for possibility of multiple lines
         lines = entry.splitlines()
@@ -70,7 +75,8 @@ def cmd(send, msg, args):
             row = Tumblrs(post=cmdargs.submit, submitter=args['nick'], nick=args['nick'], blogname=cmdargs.blogname)
             args['db'].add(row)
             args['db'].flush()
-            send("New Tumblr Post: %s -- %s, Submitted by %s" % (cmdargs.submit, cmdargs.blogname, args['nick']), target=args['config']['core']['ctrlchan'])
+            send("New Tumblr Post: %s -- %s, Submitted by %s" % (cmdargs.submit, cmdargs.blogname, args['nick']),
+                 target=args['config']['core']['ctrlchan'])
             send("Issue submitted for approval.", target=args['nick'])
     else:
         send("Did not get an argument (choices are --random, --submit)")

cslbot/commands/wai.py

@@ -28,6 +28,8 @@ def cmd(send, *_):
 
     """
     a = ["primary", "secondary", "tertiary", "hydraulic", "compressed", "required", "pseudo", "intangible", "flux"]
-    b = ["compressor", "engine", "lift", "elevator", "irc bot", "stabilizer", "computer", "ahamilto", "csl", "4506", "router", "switch", "thingy", "capacitor"]
-    c = ["broke", "exploded", "corrupted", "melted", "froze", "died", "reset", "was seen by the godofskies", "burned", "corroded", "reversed polarity", "was accidentallied", "nuked"]
+    b = ["compressor", "engine", "lift", "elevator", "irc bot", "stabilizer", "computer", "ahamilto", "csl", "4506", "router", "switch", "thingy",
+         "capacitor"]
+    c = ["broke", "exploded", "corrupted", "melted", "froze", "died", "reset", "was seen by the godofskies", "burned", "corroded",
+         "reversed polarity", "was accidentallied", "nuked"]
     send("because %s %s %s" % ((choice(a), choice(b), choice(c))))

cslbot/commands/weather.py

@@ -95,7 +95,9 @@ def get_weather(cmdargs, send, apikey):
                     'relative_humidity': '60%',
                     'pressure_in': '29.98',
                     'wind_string': 'Calm'}
-            forecastdata = {'conditions': 'Thunderstorms... Extreme Thunderstorms... Plague of Insects... The Rapture... Anti-Christ', 'high': {'fahrenheit': '3841'}, 'low': {'fahrenheit': '-6666'}}
+            forecastdata = {'conditions': 'Thunderstorms... Extreme Thunderstorms... Plague of Insects... The Rapture... Anti-Christ',
+                            'high': {'fahrenheit': '3841'},
+                            'low': {'fahrenheit': '-6666'}}
             alertdata = {'alerts': [{'description': 'Apocalypse', 'expires': 'at the end of days'}]}
         elif 'results' in data['response']:
             send("%d results found, please be more specific" % len(data['response']['results']))
@@ -117,8 +119,8 @@ def get_weather(cmdargs, send, apikey):
             return False
         forecastdata = forecastdata['forecast']['simpleforecast']['forecastday'][0]
     send("Current weather for %s:" % data['display_location']['full'])
-    current = '%s, Temp: %s (Feels like %s), Humidity: %s, Pressure: %s", Wind: %s' % (data['weather'], data['temp_f'], data['feelslike_f'], data['relative_humidity'], data['pressure_in'],
-                                                                                       data['wind_string'])
+    current = '%s, Temp: %s (Feels like %s), Humidity: %s, Pressure: %s", Wind: %s' % (
+        data['weather'], data['temp_f'], data['feelslike_f'], data['relative_humidity'], data['pressure_in'], data['wind_string'])
     forecast = '%s, High: %s, Low: %s' % (forecastdata['conditions'], forecastdata['high']['fahrenheit'], forecastdata['low']['fahrenheit'])
     send(current)
     send("Forecast: %s" % forecast)

cslbot/commands/wisdom.py

@@ -60,7 +60,11 @@ def cmd(send, msg, args):
 
     if cmdargs.query:
         cmdargs.query = ' '.join(cmdargs.query)
-    req = get("http://www.stands4.com/services/v2/quotes.php", params={'uid': uid, 'tokenid': token, 'query': cmdargs.query, 'searchtype': searchtype})
+    req = get("http://www.stands4.com/services/v2/quotes.php",
+              params={'uid': uid,
+                      'tokenid': token,
+                      'query': cmdargs.query,
+                      'searchtype': searchtype})
     xml = etree.fromstring(req.content, parser=etree.XMLParser(recover=True))
     if len(xml) == 0:
         send("No words of wisdom found")

cslbot/helpers/core.py

@@ -79,8 +79,9 @@ def __init__(self, confdir):
             self.server = server.init_server(self)
 
     def handle_event(self, c, e):
-        handled_types = ['account', 'action', 'authenticate', 'bannedfromchan', 'cap', 'ctcpreply', 'error', 'featurelist', 'join', 'kick', 'mode', 'nicknameinuse', 'nosuchnick', 'nick', 'part',
-                         'privmsg', 'privnotice', 'pubnotice', 'pubmsg', 'topic', 'welcome', 'whospcrpl']
+        handled_types = ['account', 'action', 'authenticate', 'bannedfromchan', 'cap', 'ctcpreply', 'error', 'featurelist', 'join', 'kick', 'mode',
+                         'nicknameinuse', 'nosuchnick', 'nick', 'part', 'privmsg', 'privnotice', 'pubnotice', 'pubmsg', 'topic', 'welcome',
+                         'whospcrpl']
         # We only need to do stuff for a sub-set of events.
         if e.type not in handled_types:
             return

cslbot/helpers/handler.py

@@ -622,7 +622,8 @@ def handle_msg(self, c, e):
         def send(msg, mtype='privmsg', target=target, ignore_length=False):
             self.send(target, self.connection.real_nickname, msg, mtype, ignore_length)
 
-        if e.type in ['account', 'authenticate', 'bannedfromchan', 'cap', 'ctcpreply', 'error', 'featurelist', 'nosuchnick', 'nick', 'nicknameinuse', 'privnotice', 'welcome', 'whospcrpl']:
+        if e.type in ['account', 'authenticate', 'bannedfromchan', 'cap', 'ctcpreply', 'error', 'featurelist', 'nosuchnick', 'nick', 'nicknameinuse',
+                      'privnotice', 'welcome', 'whospcrpl']:
             self.handle_event(msg, send, c, e)
             return
 

cslbot/helpers/identity.py

@@ -34,7 +34,8 @@ def get_chain(session, nick, limit=0):
     curr_time = datetime.now()
     curr = nick
     while curr is not None:
-        row = session.query(Log).filter(Log.msg == curr, Log.type == 'nick', ~Log.source.startswith('Guest'), Log.time < curr_time, Log.time >= limit).order_by(Log.time.desc()).limit(1).first()
+        row = session.query(Log).filter(Log.msg == curr, Log.type == 'nick', ~Log.source.startswith('Guest'), Log.time < curr_time,
+                                        Log.time >= limit).order_by(Log.time.desc()).limit(1).first()
         if row is not None:
             curr = row.source
             chain.append(curr)

cslbot/helpers/misc.py

@@ -42,7 +42,12 @@ def parse_time(time):
         time = int(time)
     else:
         return None
-    conv = {'s': 1, 'm': 60, 'h': timedelta(hours=1).total_seconds(), 'd': timedelta(days=1).total_seconds(), 'w': timedelta(weeks=1).total_seconds(), 'y': timedelta(weeks=52).total_seconds()}
+    conv = {'s': 1,
+            'm': 60,
+            'h': timedelta(hours=1).total_seconds(),
+            'd': timedelta(days=1).total_seconds(),
+            'w': timedelta(weeks=1).total_seconds(),
+            'y': timedelta(weeks=52).total_seconds()}
     if unit in conv.keys():
         return time * conv[unit]
     else:
@@ -136,7 +141,10 @@ def get_cmdchar(config, connection, msg, msgtype):
 
 
 def parse_header(header, msg):
-    proc = subprocess.run(['gcc', '-include', '%s.h' % header, '-fdirectives-only', '-E', '-xc', '/dev/null'], stdout=subprocess.PIPE, universal_newlines=True, check=True)
+    proc = subprocess.run(['gcc', '-include', '%s.h' % header, '-fdirectives-only', '-E', '-xc', '/dev/null'],
+                          stdout=subprocess.PIPE,
+                          universal_newlines=True,
+                          check=True)
     if header == 'errno':
         defines = re.findall('^#define (E[A-Z]*) ([0-9]+)', proc.stdout, re.MULTILINE)
     else: