From 8133461fd7b5d11d1791ef19c14a184cf6d7cea2 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Wed, 2 Dec 2020 13:00:33 +0200 Subject: [PATCH] pep8 --- erepublik/access_points.py | 4 ---- erepublik/citizen.py | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/erepublik/access_points.py b/erepublik/access_points.py index 1d471d6..c4061f9 100644 --- a/erepublik/access_points.py +++ b/erepublik/access_points.py @@ -29,14 +29,10 @@ class SlowRequests(Session): 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:80.0) Gecko/20100101 Firefox/80.0', - 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:79.0) Gecko/20100101 Firefox/79.0', - 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0', 'Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101 Firefox/83.0', 'Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101 Firefox/82.0', 'Mozilla/5.0 (X11; Linux x86_64; rv:81.0) Gecko/20100101 Firefox/81.0', 'Mozilla/5.0 (X11; Linux x86_64; rv:80.0) Gecko/20100101 Firefox/80.0', - 'Mozilla/5.0 (X11; Linux x86_64; rv:79.0) Gecko/20100101 Firefox/79.0', - 'Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0', ] debug: bool = False diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 2749e79..b8677f3 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -1687,7 +1687,8 @@ class CitizenMilitary(CitizenTravel): return bool(self.__last_war_update_data.get("citizen_contribution", [])) def find_battle_to_fight(self, silent: bool = False) -> Tuple[ - classes.Battle, classes.BattleDivision, classes.BattleSide]: + classes.Battle, classes.BattleDivision, classes.BattleSide + ]: self.update_war_info() for battle in self.sorted_battles(self.config.sort_battles_time): if not isinstance(battle, classes.Battle): @@ -1697,11 +1698,11 @@ class CitizenMilitary(CitizenTravel): if div.terrain == 0: if div.div_end: continue + maverick_ok = self.maverick and self.config.maverick if self.config.air and div.is_air: battle_zone = div break - elif self.config.ground and not div.is_air and ( - div.div == self.division or (self.maverick and self.config.maverick)): + elif self.config.ground and not div.is_air and (div.div == self.division or maverick_ok): battle_zone = div break else: