Fix some minor code style issues

Author: dmptrluke

README.md

@@ -1,6 +1,6 @@
 # CloudBot
 
-CloudBot is a simple, fast, extendable open-source Python IRC Bot!
+CloudBot is a simple, fast, expandable open-source Python IRC Bot!
 
 ## Getting CloudBot
 

plugins/geoip.py

@@ -20,7 +20,6 @@
 
 
 def fetch_db():
-    logger.info("fetch called")
     if os.path.exists(PATH):
         os.remove(PATH)
     r = requests.get(DB_URL, stream=True)
@@ -34,28 +33,23 @@ def update_db():
     """
     Updates the DB.
     """
-    try:
-        if os.path.isfile(PATH):
-            # check if file is over 2 weeks old
-            if time.time() - os.path.getmtime(PATH) > (14 * 24 * 60 * 60):
-                # geoip is outdated, re-download
-                fetch_db()
-                return geoip2.database.Reader(PATH)
-            else:
-                try:
-                    return geoip2.database.Reader(PATH)
-                except:
-                    # issue loading, geo
-                    fetch_db()
-                    return geoip2.database.Reader(PATH)
-        else:
-            # no geoip file
-            print("calling fetch_db")
+    if os.path.isfile(PATH):
+        # check if file is over 2 weeks old
+        if time.time() - os.path.getmtime(PATH) > (14 * 24 * 60 * 60):
+            # geoip is outdated, re-download
             fetch_db()
-            print("fetch_db finished")
             return geoip2.database.Reader(PATH)
-    except Exception as e:
-        print("GEOERROR" + e)
+        else:
+            try:
+                return geoip2.database.Reader(PATH)
+            except:
+                # issue loading, geo
+                fetch_db()
+                return geoip2.database.Reader(PATH)
+    else:
+        # no geoip file
+        fetch_db()
+        return geoip2.database.Reader(PATH)
 
 
 def check_db(loop):

plugins/quote.py

@@ -159,12 +159,12 @@ def quote(text, nick, chan, db, notice):
         notice(add_quote(db, chan, quoted_nick, nick, msg))
         return
     elif retrieve:
-        select, num = retrieve.groups()
-        by_chan = True if select.startswith('#') else False
+        selected, num = retrieve.groups()
+        by_chan = True if selected.startswith('#') else False
         if by_chan:
-            return get_quote_by_chan(db, select, num)
+            return get_quote_by_chan(db, selected, num)
         else:
-            return get_quote_by_nick(db, select, num)
+            return get_quote_by_nick(db, selected, num)
     elif retrieve_chan:
         chan, nick, num = retrieve_chan.groups()
         return get_quote_by_nick_chan(db, chan, nick, num)

plugins/rottentomatoes.py

@@ -9,7 +9,7 @@
 
 
 @hook.command('rottentomatoes', 'rt')
-def rottentomatoes(text, bot):
+def rotten_tomatoes(text, bot):
     """rt <title> -- gets ratings for <title> from Rotten Tomatoes"""
     api_key = bot.config.get("api_keys", {}).get("rottentomatoes", None)
     if not api_key:

plugins/speedtest.py

@@ -22,8 +22,6 @@ def speedtest_url(match):
     upload = data.xpath('//div[@class="share-speed share-upload"]/p')[0].text_content().strip()
 
     ping = data.xpath('//div[@class="share-data share-ping"]/p')[0].text_content().strip()
-    stars = data.xpath('//div[contains(@class, "share-stars")]')[0].text_content().strip()
-
     isp = data.xpath('//div[@class="share-data share-isp"]/p')[0].text_content().strip().title()
 
     return "\x02{}\x02 - Download: \x02{}\x02, Upload: \x02{}\x02, Ping: \x02{}\x02".format(isp, download, upload, ping)

plugins/steam_user.py

@@ -21,8 +21,7 @@ def convert_id32(id_64):
     :type id_64: int
     :return: str
     """
-    out = []
-    out.append("STEAM_0:")
+    out = ["STEAM_0:"]
     final = id_64 - ID_BASE
     if final % 2 == 0:
         out.append("0:")

plugins/tvdb.py

@@ -32,7 +32,7 @@ def get_episodes_for_series(series_name, api_key):
     try:
         _request = requests.get(base_url + '%s/series/%s/all/en.xml' % (api_key, series_id))
         _request.raise_for_status()
-    except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError) as e:
+    except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError):
         res["error"] = "error contacting thetvdb.com"
         return res
 

plugins/twitch.py

@@ -70,23 +70,23 @@ def twitch_lookup(location):
     locsplit = location.split("/")
     if len(locsplit) > 1 and len(locsplit) == 3:
         channel = locsplit[0]
-        type = locsplit[1]  # should be b or c
-        id = locsplit[2]
+        _type = locsplit[1]  # should be b or c
+        _id = locsplit[2]
     else:
         channel = locsplit[0]
-        type = None
-        id = None
+        _type = None
+        _id = None
     fmt = "{}: {} playing {} ({})"  # Title: nickname playing Game (x views)
-    if type and id:
-        if type == "b":  # I haven't found an API to retrieve broadcast info
+    if _type and _id:
+        if _type == "b":  # I haven't found an API to retrieve broadcast info
             soup = http.get_soup("http://twitch.tv/" + location)
             title = soup.find('span', {'class': 'real_title js-title'}).text
             playing = soup.find('a', {'class': 'game js-game'}).text
             views = soup.find('span', {'id': 'views-count'}).text + " view"
             views = views + "s" if not views[0:2] == "1 " else views
             return html.unescape(fmt.format(title, channel, playing, views))
-        elif type == "c":
-            data = http.get_json("https://api.twitch.tv/kraken/videos/" + type + id)
+        elif _type == "c":
+            data = http.get_json("https://api.twitch.tv/kraken/videos/" + _type + _id)
             title = data['title']
             playing = data['game']
             views = str(data['views']) + " view"

plugins/youtube.py

@@ -17,15 +17,15 @@
 search_api_url = base_url + 'search?part=id&maxResults=1'
 playlist_api_url = base_url + 'playlists?part=snippet%2CcontentDetails%2Cstatus'
 video_url = "http://youtu.be/%s"
-err_noapi = "The YouTube API is off in the Google Developers Console."
+err_no_api = "The YouTube API is off in the Google Developers Console."
 
 
 def get_video_description(video_id, key):
     json = requests.get(api_url.format(video_id, key)).json()
 
     if json.get('error'):
         if json['error']['code'] == 403:
-            return err_noapi
+            return err_no_api
         else:
             return
 
@@ -41,14 +41,14 @@ def get_video_description(video_id, key):
 
     length = isodate.parse_duration(content_details['duration'])
     out += ' - length \x02{}\x02'.format(timeformat.format_time(int(length.total_seconds()), simple=True))
-    totalvotes = float(statistics['likeCount']) + float(statistics['dislikeCount'])
+    total_votes = float(statistics['likeCount']) + float(statistics['dislikeCount'])
 
-    if totalvotes != 0:
+    if total_votes != 0:
         # format
         likes = pluralize(int(statistics['likeCount']), "like")
         dislikes = pluralize(int(statistics['dislikeCount']), "dislike")
 
-        percent = 100 * float(statistics['likeCount']) / totalvotes
+        percent = 100 * float(statistics['likeCount']) / total_votes
         out += ' - {}, {} (\x02{:.1f}\x02%)'.format(likes,
                                                     dislikes, percent)
 
@@ -75,7 +75,7 @@ def load_key(bot):
 
 
 @hook.regex(youtube_re)
-def youtube_url(match, bot):
+def youtube_url(match):
     return get_video_description(match.group(1), dev_key)
 
 
@@ -89,7 +89,7 @@ def youtube(text):
 
     if json.get('error'):
         if json['error']['code'] == 403:
-            return err_noapi
+            return err_no_api
         else:
             return 'Error performing search.'
 
@@ -111,7 +111,7 @@ def youtime(text):
 
     if json.get('error'):
         if json['error']['code'] == 403:
-            return err_noapi
+            return err_no_api
         else:
             return 'Error performing search.'
 
@@ -154,7 +154,7 @@ def ytplaylist_url(match):
 
     if json.get('error'):
         if json['error']['code'] == 403:
-            return err_noapi
+            return err_no_api
         else:
             return 'Error looking up playlist.'