eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'dict' object has no attribute 'json'

Browse Source
This commit is contained in:
Eriks K 2020-05-15 09:17:56 +03:00
parent 588475d554
commit c216d98287
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/__init__.py
View File

@ -5,7 +5,7 @@
__author__ = """Eriks Karls""" __author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv' __email__ = 'eriks@72.lv'
__version__ = '0.20.0' __version__ = '0.20.0'
__commit_id__ = "ab3ce2b" __commit_id__ = "588475d"
from erepublik import classes, utils from erepublik import classes, utils
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

24
erepublik/citizen.py
View File

@ -725,10 +725,10 @@ class CitizenTravel(BaseCitizen):
self.update_citizen_info() self.update_citizen_info()
res_r = self.details.residence_region res_r = self.details.residence_region
if self.details.residence_country and res_r and not res_r == self.details.current_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) r_json = self._travel(self.details.residence_country, self.details.residence_region).json()
if r.json().get('message', '') == 'success': if r_json.get('message', '') == 'success':
self._update_citizen_location(self.details.residence_country, self.details.current_region) 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 True
return False return False
return True return True
@ -738,10 +738,10 @@ class CitizenTravel(BaseCitizen):
if data.get('alreadyInRegion'): if data.get('alreadyInRegion'):
return True return True
else: else:
r = self._travel(data.get('preselectCountryId'), region_id).json() r_json = self._travel(data.get('preselectCountryId'), region_id).json()
if r.get('message', '') == 'success': if r_json.get('message', '') == 'success':
self._update_citizen_location(data.get('preselectCountryId'), region_id) 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 True
return False return False
@ -755,10 +755,10 @@ class CitizenTravel(BaseCitizen):
regs.append((region['id'], region['distanceInKm'])) regs.append((region['id'], region['distanceInKm']))
if regs: if regs:
region_id = min(regs, key=lambda _: int(_[1]))[0] region_id = min(regs, key=lambda _: int(_[1]))[0]
r = self._travel(country_id, region_id).json() r_json = self._travel(country_id, region_id).json()
if r.get('message', '') == 'success': if r_json.get('message', '') == 'success':
self._update_citizen_location(country_id, region_id) 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 True
return False return False
@ -767,10 +767,10 @@ class CitizenTravel(BaseCitizen):
if data.get('alreadyInRegion'): if data.get('alreadyInRegion'):
return True return True
else: else:
r = self._travel(data.get('preselectCountryId'), data.get('preselectRegionId')).json() r_json = self._travel(data.get('preselectCountryId'), data.get('preselectRegionId')).json()
if r.get('message', '') == 'success': if r_json.get('message', '') == 'success':
self._update_citizen_location(data.get('preselectCountryId'), data.get('preselectRegionId')) 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 True
return False return False