From 896b1b24321b2248ff9e111668fd0c9c22ca7093 Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Thu, 5 Sep 2019 15:01:54 +0300 Subject: [PATCH] Bugfix, cleanup and optimisation --- erepublik/citizen.py | 2 +- erepublik/classes.py | 3 ++- tests/test_erepublik_script.py | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 8053b2b..7f7ed57 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -93,7 +93,7 @@ class Citizen(classes.CitizenAPI): def __dict__(self): ret = {} for key in dir(self): - if not key.startswith('_'): + if not key.startswith('_') and not callable(getattr(self, key)): ret[key] = getattr(self, key) ret.pop('reporter', None) ret.pop('stop_threads', None) diff --git a/erepublik/classes.py b/erepublik/classes.py index 4e505f5..6767683 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -695,7 +695,8 @@ Class for unifying eRepublik known endpoints and their required/optional paramet data.update({"sell": "sell"}) else: data.update({"dissolve": factory}) - return self.post("{}/economy/sell-company/{}".format(self.url, factory), data=data, headers={"Referer": url}) + return self.post("{}/economy/sell-company/{}".format(self.url, factory), + data=data, headers={"Referer": self.url}) def _post_economy_train(self, tg_ids: List[int]) -> Response: data: Dict[str, Union[int, str]] = {} diff --git a/tests/test_erepublik_script.py b/tests/test_erepublik_script.py index 3095019..6574499 100644 --- a/tests/test_erepublik_script.py +++ b/tests/test_erepublik_script.py @@ -17,9 +17,6 @@ class TestErepublik(unittest.TestCase): self.citizen = Citizen("email", "password", False) self.citizen.config.interactive = False - def test_000_something(self): - """Test something.""" - def test_should_do_levelup(self): self.citizen.energy.recovered = 1900 self.citizen.energy.recoverable = 2940