From c216d982871d30efe6ed623638ac8287c9f34e3e Mon Sep 17 00:00:00 2001 From: Eriks K Date: Fri, 15 May 2020 09:17:56 +0300 Subject: [PATCH] 'dict' object has no attribute 'json' --- erepublik/__init__.py | 2 +- erepublik/citizen.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 0ce2933..6fe3aa9 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__ = "ab3ce2b" +__commit_id__ = "588475d" from erepublik import classes, utils from erepublik.citizen import Citizen diff --git a/erepublik/citizen.py b/erepublik/citizen.py index b2ea9c8..167038a 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -725,10 +725,10 @@ class CitizenTravel(BaseCitizen): self.update_citizen_info() res_r = self.details.residence_region if self.details.residence_country and res_r and not res_r == self.details.current_region: - r = self._travel(self.details.residence_country, self.details.residence_region) - if r.json().get('message', '') == 'success': + r_json = self._travel(self.details.residence_country, self.details.residence_region).json() + if r_json.get('message', '') == 'success': self._update_citizen_location(self.details.residence_country, self.details.current_region) - self._report_action("TRAVEL", "Traveled to residence", response=r.json()) + self._report_action("TRAVEL", "Traveled to residence", response=r_json) return True return False return True @@ -738,10 +738,10 @@ class CitizenTravel(BaseCitizen): if data.get('alreadyInRegion'): return True else: - r = self._travel(data.get('preselectCountryId'), region_id).json() - if r.get('message', '') == 'success': + r_json = self._travel(data.get('preselectCountryId'), region_id).json() + if r_json.get('message', '') == 'success': self._update_citizen_location(data.get('preselectCountryId'), region_id) - self._report_action("TRAVEL", "Traveled to region", response=r.json()) + self._report_action("TRAVEL", "Traveled to region", response=r_json) return True return False @@ -755,10 +755,10 @@ class CitizenTravel(BaseCitizen): regs.append((region['id'], region['distanceInKm'])) if regs: region_id = min(regs, key=lambda _: int(_[1]))[0] - r = self._travel(country_id, region_id).json() - if r.get('message', '') == 'success': + r_json = self._travel(country_id, region_id).json() + if r_json.get('message', '') == 'success': self._update_citizen_location(country_id, region_id) - self._report_action("TRAVEL", f"Traveled to {utils.COUNTRIES[country_id]}", response=r.json()) + self._report_action("TRAVEL", f"Traveled to {utils.COUNTRIES[country_id]}", response=r_json) return True return False @@ -767,10 +767,10 @@ class CitizenTravel(BaseCitizen): if data.get('alreadyInRegion'): return True else: - r = self._travel(data.get('preselectCountryId'), data.get('preselectRegionId')).json() - if r.get('message', '') == 'success': + r_json = self._travel(data.get('preselectCountryId'), data.get('preselectRegionId')).json() + if r_json.get('message', '') == 'success': self._update_citizen_location(data.get('preselectCountryId'), data.get('preselectRegionId')) - self._report_action("TRAVEL", f"Traveled to holding {holding_id}", response=r.json()) + self._report_action("TRAVEL", f"Traveled to holding {holding_id}", response=r_json) return True return False