From a8f3975f7e9f609c7abadd85fbe7fc664da675db Mon Sep 17 00:00:00 2001 From: rlaphoenix Date: Fri, 10 Feb 2023 19:49:19 +0000 Subject: [PATCH] Remove assert statements from base Service class The 2nd assert statement is completely unnecessary, and the first one can be resolved by using it in an if instead. --- devine/core/service.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/devine/core/service.py b/devine/core/service.py index cd5111c..6e91978 100644 --- a/devine/core/service.py +++ b/devine/core/service.py @@ -30,14 +30,15 @@ class Service(metaclass=ABCMeta): def __init__(self, ctx: click.Context): self.config = ctx.obj.config - assert ctx.parent is not None - assert ctx.parent.parent is not None - self.log = logging.getLogger(self.__class__.__name__) self.session = self.get_session() self.cache = Cacher(self.__class__.__name__) - self.proxy = ctx.parent.params["proxy"] + if ctx.parent: + self.proxy = ctx.parent.params["proxy"] + else: + self.proxy = None + if not self.proxy and self.GEOFENCE: # no explicit proxy, let's get one to GEOFENCE if needed current_region = get_ip_info(self.session)["country"].lower() @@ -50,6 +51,7 @@ class Service(metaclass=ABCMeta): if self.proxy: self.log.info(f" + {self.proxy} (from {proxy_provider.__class__.__name__})") break + if self.proxy: self.session.proxies.update({"all": self.proxy}) proxy_parse = urlparse(self.proxy)