diff --git a/setup.py b/setup.py index 088a53d..953c759 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,7 @@ def read(rel_path): with codecs.open(os.path.join(here, rel_path), 'r') as fp: return fp.read() + def get_version(rel_path): for line in read(rel_path).splitlines(): if line.startswith('__version__'): diff --git a/warpy/exceptions.py b/warpy/exceptions.py index f1e0cb0..e1924d2 100644 --- a/warpy/exceptions.py +++ b/warpy/exceptions.py @@ -1,12 +1,12 @@ class NonPlatformError(Exception): def __init__(self, platform): self.platform = platform - self.message = str(platform) + ' is not a valid platform. The following platforms are supported: ' \ - '\'pc\', \'ps4\', \'xb1\', \'swi\'.' + self.message = f'{platform} is not a valid platform. The following platforms are supported: ' \ + '\'pc\', \'ps4\', \'xb1\', \'swi\'.' class NonLanguageError(Exception): def __init__(self, language): self.language = language - self.message = str(language) + ' is not a valid language. The following languages are supported: ' \ - '\'de\', \'es\', \'fr\', \'it\', \'ko\', \'pl\', \'pt\', \'ru\', \'zh\', \'en\'.' + self.message = f'{language} is not a valid language. The following languages are supported: '\ + '\'de\', \'es\', \'fr\', \'it\', \'ko\', \'pl\', \'pt\', \'ru\', \'zh\', \'en\'.' diff --git a/warpy/warpy.py b/warpy/warpy.py index cdd3c32..3fc41b1 100644 --- a/warpy/warpy.py +++ b/warpy/warpy.py @@ -44,7 +44,9 @@ class Worldstate: async def cambion_status(self): url = WARFRAME_API + '/{platform}/cambionCycle'.format(platform=self.platform) - return await self._fetch(url) + json = await self._fetch(url) + json["state"] = json["active"] + return json async def cetus_status(self): url = WARFRAME_API + '/{platform}/cetusCycle'.format(platform=self.platform) @@ -131,7 +133,9 @@ class Worldstate: async def vallis_status(self): url = WARFRAME_API + '/{platform}/vallisCycle'.format(platform=self.platform) - return await self._fetch(url) + json = await self._fetch(url) + json['state'] = "warm" if json["isWarm"] else "cold" + return json async def void_trader(self): url = WARFRAME_API + '/{platform}/voidTrader'.format(platform=self.platform)