From 2aa1cbd79e03c9ce707b70c1978f9d35ceb846de Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Thu, 23 Apr 2020 14:28:26 +0300 Subject: [PATCH] PEP8 --- erepublik/__init__.py | 2 +- erepublik/citizen.py | 21 +++++++++++++-------- erepublik/classes.py | 9 ++++----- erepublik/utils.py | 1 - 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 0668f6f..9ab63f1 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -5,7 +5,7 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' __version__ = '0.20.0' -__commit_id__ = "2efc949" +__commit_id__ = "2eecd9f" from erepublik import classes, utils from erepublik.citizen import Citizen diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 6cde999..2b4a9cb 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -7,7 +7,7 @@ from threading import Event from time import sleep from typing import Any, Dict, List, Optional, Set, Tuple, Union, Callable, NoReturn -from requests import RequestException, Response +from requests import RequestException, Response, HTTPError from erepublik import utils from erepublik.classes import (Battle, BattleDivision, CitizenAPI, Config, Details, Energy, ErepublikException, @@ -538,7 +538,11 @@ class BaseCitizen(CitizenAPI): title = info.group(2).strip() award_id = re.search(r'"wall_enable_alerts_(\d+)', medal) if award_id: - self._post_main_wall_post_automatic(message=title, achievement_id=award_id.group(1)) + try: + award_id = int(award_id.group(1)) + self._post_main_wall_post_automatic(message=title, achievement_id=award_id) + except ValueError: + pass reward, currency = info.group(3).strip().split(" ") while not isinstance(reward, float): try: @@ -957,7 +961,7 @@ class CitizenEconomy(CitizenTravel): return {"gold": 0, "cc": 0, 'ok': False} def accept_money_donations(self): - for notification in self._get_main_notifications_ajax_system(): + for notification in self._get_main_notifications_ajax_system().json(): don_id = re.search(r"erepublik.functions.acceptRejectDonation\(\"accept\", (\d+)\)", notification) if don_id: self._get_main_money_donation_accept(int(don_id.group(1))) @@ -1472,13 +1476,14 @@ class CitizenMilitary(CitizenTravel): self.travel_to_residence() break - def fight(self, battle_id: int, side_id: int = None, count: int = None, division: int= None) -> int: + def fight(self, battle_id: int, side_id: int = None, count: int = None, division: int = None) -> int: """Fight in a battle. Will auto activate booster and travel if allowed to do it. :param battle_id: int BattleId - battle to fight in :type battle_id: int - :param side_id: int or None. Battle side to fight in, If side_id not == invader id or not in invader deployed allies list, then defender's side is chosen + :param side_id: int or None. Battle side to fight in, If side_id not == invader id or not in invader deployed + allies list, then defender's side is chosen :type side_id: int :param count: How many hits to do, if not specified self.should_fight() is called. :type count: int @@ -1535,7 +1540,7 @@ class CitizenMilitary(CitizenTravel): return 0, 1, 0 try: j_resp = response.json() - except: + except (ValueError, HTTPError, RequestException): return 0, 10, 0 hits = 0 damage = 0 @@ -2250,7 +2255,7 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenEconomy, CitizenLeade self.send_inventory_update() sleep_seconds = (start_time - self.now).total_seconds() self.stop_threads.wait(sleep_seconds if sleep_seconds > 0 else 0) - except: + except: # noqa self.report_error("State updater crashed") def send_state_update(self): @@ -2326,7 +2331,7 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenEconomy, CitizenLeade if raw_kind: raw_kind = raw_kind.group(1) result = response.get("result", {}) - amount_needed = round(result.get("consume",0) - result.get("stock", 0) + 0.49) + amount_needed = round(result.get("consume", 0) - result.get("stock", 0) + 0.49) start_place = (self.details.current_country, self.details.current_region) while amount_needed > 0: amount = amount_needed diff --git a/erepublik/classes.py b/erepublik/classes.py index ea8b80c..2c96256 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -8,7 +8,6 @@ from typing import Any, Dict, Iterable, List, Tuple, Union from requests import Response, Session, post from erepublik import utils -from erepublik.access_points import CitizenAPI try: import simplejson as json @@ -435,8 +434,8 @@ class Reporter: try: r = self.__bot_update(dict(key=self.key, check=True, player_id=self.citizen_id)) if not r.json().get("status"): - r = self._req.post("{}/bot/register".format(self.url), json=dict(name=self.name, email=self.email, - player_id=self.citizen_id)) + self._req.post("{}/bot/register".format(self.url), json=dict(name=self.name, email=self.email, + player_id=self.citizen_id)) finally: self.__registered = True self.__allowed = True @@ -476,7 +475,7 @@ class MyJSONEncoder(json.JSONEncoder): return float("{:.02f}".format(o)) elif isinstance(o, datetime.datetime): return dict(__type__='datetime', date=o.strftime("%Y-%m-%d"), time=o.strftime("%H:%M:%S"), - tzinfo=o.tzinfo.zone if o.tzinfo else None) + tzinfo=o.tzinfo.tzname if o.tzinfo else None) elif isinstance(o, datetime.date): return dict(__type__='date', date=o.strftime("%Y-%m-%d")) elif isinstance(o, datetime.timedelta): @@ -722,7 +721,7 @@ class TelegramBot: message = f"Full energy ({available}hp/{limit}hp +{interval}hp/6min)" self.send_message(message) - def report_medal(self, msg, multiple: bool=True): + def report_medal(self, msg, multiple: bool = True): new_line = '\n' if multiple else '' self.send_message(f"New award: {new_line}*{msg}*") diff --git a/erepublik/utils.py b/erepublik/utils.py index 790d0d9..0b7f725 100644 --- a/erepublik/utils.py +++ b/erepublik/utils.py @@ -21,7 +21,6 @@ try: except ImportError: import json - __all__ = ["FOOD_ENERGY", "COMMIT_ID", "COUNTRIES", "erep_tz", 'COUNTRY_LINK', "now", "localize_dt", "localize_timestamp", "good_timedelta", "eday_from_date", "date_from_eday", "get_sleep_seconds", "interactive_sleep", "silent_sleep",