diff --git a/requirements.txt b/requirements.txt index 4db46fd..75eb26c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ tornado bismuthclient>=0.0.30 cachetools +aiohttp diff --git a/wallet/crystals/200_dragginator/__init__.py b/wallet/crystals/200_dragginator/__init__.py index 6402c07..208c087 100644 --- a/wallet/crystals/200_dragginator/__init__.py +++ b/wallet/crystals/200_dragginator/__init__.py @@ -29,7 +29,7 @@ async def async_get(url, is_json=False): # async with aiohttp.ClientSession() as session: async with HTTP_SESSION.get(url) as resp: if is_json: - return await resp.json() + return await resp.json(content_type=None) else: return await resp.text() # TODO: could use resp content-type to decide diff --git a/wallet/make_dist.bat b/wallet/make_dist.bat index 47f6110..5688cb1 100644 --- a/wallet/make_dist.bat +++ b/wallet/make_dist.bat @@ -1,4 +1,4 @@ -pyinstaller --hidden-import tornado.locale --onefile wallet.py +pyinstaller --hidden-import tornado.locale --hidden-import aiohttp --onefile wallet.py robocopy locale dist/locale /S /E *.mo mkdir dist/themes robocopy themes/material dist/themes/material /S /E diff --git a/wallet/wallet.py b/wallet/wallet.py index c1f16fe..af5132d 100644 --- a/wallet/wallet.py +++ b/wallet/wallet.py @@ -32,8 +32,9 @@ from modules.basehandlers import BaseHandler, CrystalLoader from modules import helpers from modules.crystals import CrystalManager +from modules import i18n # helps pyinstaller -__version__ = '0.0.72' +__version__ = '0.0.73' define("port", default=8888, help="run on the given port", type=int) define("listen", default="127.0.0.1", help="On which address to listen, locked by default to localhost for safety", type=str)