From 6884c12c404b5225f112336f708cb08a8c192d52 Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sat, 1 Jun 2019 11:01:22 -0400 Subject: [PATCH] Add docstring and fix hardcoded strings --- deletefb/deletefb.py | 3 +-- deletefb/tools/common.py | 12 +++++++++--- deletefb/tools/likes.py | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/deletefb/deletefb.py b/deletefb/deletefb.py index 832280a..54d0c66 100755 --- a/deletefb/deletefb.py +++ b/deletefb/deletefb.py @@ -11,8 +11,7 @@ from tools.login import login from tools.wall import delete_posts from tools.likes import unlike_pages - -LOG = logger(__name__) +LOG = logger("deletefb") def run_delete(): diff --git a/deletefb/tools/common.py b/deletefb/tools/common.py index b50dc90..fe97881 100644 --- a/deletefb/tools/common.py +++ b/deletefb/tools/common.py @@ -26,15 +26,21 @@ def try_move(actions, el): time.sleep(5) continue -def logger(name: str): - # called from directory (__main__.py) +def logger(name): + """ + Args: + name (str): Logger name + + Returns: + logging.Logger + """ config_path = "deletefb/logging_conf.json" if not isfile(config_path): # called from file (deletefb.py) os.chdir("..") with open(config_path, "r", encoding="utf-8") as config_file: config = json.load(config_file) logging.config.dictConfig(config["logging"]) - return logging.getLogger("deletefb") + return logging.getLogger(name) def archiver(category): """ diff --git a/deletefb/tools/likes.py b/deletefb/tools/likes.py index abef381..cbb8886 100644 --- a/deletefb/tools/likes.py +++ b/deletefb/tools/likes.py @@ -3,7 +3,9 @@ from selenium.webdriver.common.action_chains import ActionChains from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC -from .common import SELENIUM_EXCEPTIONS, archiver +from .common import SELENIUM_EXCEPTIONS, archiver, logger + +LOG = logger(__name__) def load_likes(driver): @@ -29,6 +31,7 @@ def load_likes(driver): EC.presence_of_element_located((By.XPATH, "//button/div/i[@aria-hidden=\"true\"]")) ) except SELENIUM_EXCEPTIONS: + LOG.exception("Traceback of load_likes") return def unlike_pages(driver):