From b1d1e3467c6c7f3cd9a50b3169923c5477d98074 Mon Sep 17 00:00:00 2001 From: kh99 Date: Fri, 29 Dec 2017 13:15:04 +0530 Subject: [PATCH] Update: python3 porting and PEP8 style coding in analytics.py appindicator_replacement.py chrome.py firefox.py hackernews.py version.py --- hackertray/analytics.py | 15 +++++++++------ hackertray/appindicator_replacement.py | 8 +++++--- hackertray/chrome.py | 12 ++++++++---- hackertray/firefox.py | 13 +++++++++---- hackertray/hackernews.py | 2 +- hackertray/version.py | 12 ++++++++---- 6 files changed, 40 insertions(+), 22 deletions(-) diff --git a/hackertray/analytics.py b/hackertray/analytics.py index f1437aa..597ee4c 100644 --- a/hackertray/analytics.py +++ b/hackertray/analytics.py @@ -1,5 +1,6 @@ from mixpanel import Mixpanel + class Analytics: # Setup analytics. # dnt - do not track. Disables tracking if True @@ -7,17 +8,19 @@ class Analytics: def __init__(self, dnt, token): self.dnt = dnt self.tracker = Mixpanel(token) - if(self.dnt == True): - print "[+] Analytics disabled" + if(self.dnt is True): + print("[+] Analytics disabled") # Track an event # event - string containing the event name # data - data related to the event, defaults to {} - def track(self, event, data = {}): - if(self.dnt == False): + + def track(self, event, data={}): + if(self.dnt is False): # All events are tracked anonymously self.tracker.track("anonymous", event, data) # Track a visit to a URL - # The url maybe an HN submission or + # The url maybe an HN submission or # some meta-url pertaining to hackertray + def visit(self, url): - self.track('visit', {"link":url}) \ No newline at end of file + self.track('visit', {"link": url}) diff --git a/hackertray/appindicator_replacement.py b/hackertray/appindicator_replacement.py index 8ea0171..0a14f62 100644 --- a/hackertray/appindicator_replacement.py +++ b/hackertray/appindicator_replacement.py @@ -1,4 +1,4 @@ -#========================= +# ========================= # # AppIndicator for GTK # drop-in replacement @@ -6,7 +6,7 @@ # Copyright 2010 # Nathan Osman # -#========================= +# ========================= # We require PyGTK import gtk @@ -29,7 +29,9 @@ STATUS_ATTENTION = 1 def get_icon_filename(icon_name): # Determine where the icon is - return os.path.abspath(resource_filename('hackertray.data', 'hacker-tray.png')) + return os.path.abspath( + resource_filename('hackertray.data', 'hacker-tray.png') + ) # The main class diff --git a/hackertray/chrome.py b/hackertray/chrome.py index e08d9a4..97b1bca 100644 --- a/hackertray/chrome.py +++ b/hackertray/chrome.py @@ -4,8 +4,10 @@ import shutil import os import sys + class Chrome: HISTORY_TMP_LOCATION = '/tmp/hackertray.chrome' + @staticmethod def search(urls, config_folder_path): Chrome.setup(config_folder_path) @@ -13,17 +15,19 @@ class Chrome: db = conn.cursor() result = [] for url in urls: - db_result = db.execute('SELECT url from urls WHERE url=:url',{"url":url}) - if(db.fetchone() == None): + # db_result = db.execute( + # 'SELECT url from urls WHERE url=:url',{"url":url}) + if db.fetchone() is None: result.append(False) else: result.append(True) os.remove(Chrome.HISTORY_TMP_LOCATION) return result + @staticmethod def setup(config_folder_path): - file_name = os.path.abspath(config_folder_path+'/History') + file_name = os.path.abspath(config_folder_path + '/History') if not os.path.isfile(file_name): - print("ERROR: ", "Could not find Chrome history file", file=sys.stderr) + print("ERROR: ", "Could not find Chrome history file",file=sys.stderr) sys.exit(1) shutil.copyfile(file_name, Chrome.HISTORY_TMP_LOCATION) diff --git a/hackertray/firefox.py b/hackertray/firefox.py index 56a2041..cd94a83 100644 --- a/hackertray/firefox.py +++ b/hackertray/firefox.py @@ -4,9 +4,11 @@ import shutil import os import sys + class Firefox: HISTORY_TMP_LOCATION = '/tmp/hackertray.firefox' HISTORY_FILE_NAME = '/places.sqlite' + @staticmethod def search(urls, config_folder_path): Firefox.setup(config_folder_path) @@ -14,17 +16,20 @@ class Firefox: db = conn.cursor() result = [] for url in urls: - db_result = db.execute('SELECT url from moz_places WHERE url=:url',{"url":url}) - if(db.fetchone() == None): + # db_result = db.execute( + # 'SELECT url from moz_places WHERE url=:url',{"url":url}) + if db.fetchone() is None: result.append(False) else: result.append(True) os.remove(Firefox.HISTORY_TMP_LOCATION) return result + @staticmethod def setup(config_folder_path): - file_name = os.path.abspath(config_folder_path+Firefox.HISTORY_FILE_NAME) + file_name = os.path.abspath( + config_folder_path + Firefox.HISTORY_FILE_NAME) if not os.path.isfile(file_name): print("ERROR: ", "Could not find Firefox history file", file=sys.stderr) sys.exit(1) - shutil.copyfile(file_name, Firefox.HISTORY_TMP_LOCATION) \ No newline at end of file + shutil.copyfile(file_name, Firefox.HISTORY_TMP_LOCATION) diff --git a/hackertray/hackernews.py b/hackertray/hackernews.py index 9857e45..0a695e2 100644 --- a/hackertray/hackernews.py +++ b/hackertray/hackernews.py @@ -15,4 +15,4 @@ class HackerNews: try: return r.json() except ValueError: - continue \ No newline at end of file + continue diff --git a/hackertray/version.py b/hackertray/version.py index e6414d2..ca199c0 100644 --- a/hackertray/version.py +++ b/hackertray/version.py @@ -1,8 +1,10 @@ import requests import pkg_resources + class Version: PYPI_URL = "https://pypi.python.org/pypi/hackertray/json" + @staticmethod def latest(): res = requests.get(Version.PYPI_URL).json() @@ -14,14 +16,16 @@ class Version: @staticmethod def new_available(): - latest = Version.latest() + latest = Version.latest() current = Version.current() try: if pkg_resources.parse_version(latest) > pkg_resources.parse_version(current): - print "[+] New version " + latest + " is available" + print("[+] New version " + latest + " is available") return True + else: return False + except requests.exceptions.RequestException as e: - print "[+] There was an error in trying to fetch updates" - return False \ No newline at end of file + print("[+] There was an error in trying to fetch updates") + return False