diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 13947d6..3befd64 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -303,7 +303,7 @@ class Citizen(classes.CitizenAPI): """ if html is None: self._get_main() - html = self.r.text + return ugly_js = re.search(r'"promotions":\s*(\[{?.*?}?])', html).group(1) promos = loads(utils.normalize_html_json(ugly_js)) self.promos = {k: v for k, v in (self.promos.items() if self.promos else {}) if v > self.now} @@ -552,7 +552,6 @@ class Citizen(classes.CitizenAPI): @property def health_info(self): - self.update_citizen_info() ret = "{}/{} + {}, {}hp/6m. {}xp until level up".format( self.energy.recovered, self.energy.limit, diff --git a/erepublik/classes.py b/erepublik/classes.py index 490b62e..f542fd8 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -1173,7 +1173,7 @@ class TelegramBot: message = f"Player *{self.player_name}*\n" + message if utils.good_timedelta(utils.now(), datetime.timedelta(seconds=-1)) <= self.__last_time: tb = traceback.extract_stack() - message += "\n\n```\n{}\n```".format("\n".join([str(l) for l in tb])) + message += "\n\n```\n{}\n```".format("\n".join([' File "{}", line {}, in {}\n'.format(l.filename, l.lineno, l.name) for l in tb])) response = post(self.api_url, json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown")) self.__last_time = utils.now() return response.json().get('ok') diff --git a/setup.py b/setup.py index 3207df1..6e12fb7 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open('README.rst') as readme_file: with open('HISTORY.rst') as history_file: history = history_file.read() -requirements = ['pytz==2019.2', 'requests==2.22.0'] +requirements = ['pytz>=2019.2', 'requests>=2.22'] setup_requirements = [ ] @@ -41,7 +41,7 @@ setup( setup_requires=setup_requirements, test_suite='tests', tests_require=test_requirements, - url='https://github.com/eeriks/erepublik_script', + url='https://github.com/eeriks/erepublik/t', version='0.15.3', zip_safe=False, )