Merge pull request #265 from mathsman5133/orjson

Switch to orjson

Author: lukasthaler

coc/abc.py

@@ -21,7 +21,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-import ujson
+import orjson
 from pathlib import Path
 from typing import AsyncIterator, Any, Dict, Type, Optional, TYPE_CHECKING
 
@@ -223,8 +223,8 @@ def _load_json_meta(cls, json_meta: dict, id, name: str, lab_to_townhall):
             production_building = "Pet Shop"
 
         # load buildings
-        with open(BUILDING_FILE_PATH) as fp:
-            buildings = ujson.load(fp)
+        with open(BUILDING_FILE_PATH, 'rb') as fp:
+            buildings = orjson.loads(fp.read())
 
         # without production_building, it is a hero
         if not production_building:
@@ -346,8 +346,8 @@ def __init__(self):
         self.loaded = False
 
     def _load_json(self, english_aliases, lab_to_townhall):
-        with open(self.FILE_PATH) as fp:
-            data = ujson.load(fp)
+        with open(self.FILE_PATH, 'rb') as fp:
+            data = orjson.loads(fp.read())
 
         id = 2000
         for c, [supercell_name, meta] in enumerate(data.items()):

coc/client.py

@@ -29,7 +29,7 @@
 from pathlib import Path
 from typing import AsyncIterator, Iterable, List, Optional, Type, Union, TYPE_CHECKING
 
-import ujson
+import orjson
 
 from .clans import Clan, RankedClan
 from .errors import Forbidden, GatewayError, NotFound, PrivateWarLog
@@ -350,11 +350,11 @@ def _create_client(self, email, password):
         )
 
     def _load_holders(self):
-        with open(ENGLISH_ALIAS_PATH) as fp:
-            english_aliases = ujson.load(fp)
+        with open(ENGLISH_ALIAS_PATH, 'rb') as fp:
+            english_aliases = orjson.loads(fp.read())
 
-        with open(BUILDING_FILE_PATH) as fp:
-            buildings = ujson.load(fp)
+        with open(BUILDING_FILE_PATH, 'rb') as fp:
+            buildings = orjson.loads(fp.read())
 
         english_aliases = {
             v["TID"]: v.get("EN", None)

coc/hero.py

@@ -1,4 +1,4 @@
-import ujson
+import orjson
 
 from typing import TYPE_CHECKING, Dict, List, Optional, Type
 from pathlib import Path
@@ -311,8 +311,8 @@ class EquipmentHolder(DataContainerHolder):
 
     def _load_json(self, english_aliases, lab_to_townhall):
         id = 3000
-        with open(EQUIPMENT_FILE_PATH) as fp:
-            equipment_data = ujson.load(fp)
+        with open(EQUIPMENT_FILE_PATH, 'rb') as fp:
+            equipment_data = orjson.loads(fp.read())
 
         for supercell_name, equipment_meta in equipment_data.items():
             if not equipment_meta.get("TID"):

coc/http.py

@@ -35,6 +35,7 @@
 from json import loads as json_loads
 
 import aiohttp
+import orjson
 
 from .errors import (
     HTTPException,
@@ -52,10 +53,10 @@
 stats_url_matcher = re.compile(r"%23[\da-zA-Z]+|\d{8,}|global")
 
 
-async def json_or_text(response):
+async def json_or_text(response: aiohttp.ClientResponse):
     """Parses an aiohttp response into a the string or json response."""
     try:
-        ret = await response.json()
+        ret = await response.json(loads=orjson.loads)
     except aiohttp.ContentTypeError:
         ret = await response.text(encoding="utf-8")
 

coc/spell.py

@@ -1,4 +1,4 @@
-import ujson
+import orjson
 
 from typing import Type, Dict, List
 from pathlib import Path
@@ -127,10 +127,10 @@ class SpellHolder(DataContainerHolder):
     data_object = Spell
 
     def _load_json(self, english_aliases, lab_to_townhall):
-        with open(SPELLS_FILE_PATH) as fp:
-            spell_data = ujson.load(fp)
-        with open(ARMY_LINK_ID_FILE_PATH) as fp:
-            army_link_ids = ujson.load(fp)
+        with open(SPELLS_FILE_PATH, 'rb') as fp:
+            spell_data = orjson.loads(fp.read())
+        with open(ARMY_LINK_ID_FILE_PATH, 'rb') as fp:
+            army_link_ids = orjson.loads(fp.read())
 
         id = 2000  # fallback ID for non-standard spells
         for supercell_name, spell_meta in spell_data.items():

coc/troop.py

@@ -1,7 +1,7 @@
 from typing import Dict, List, Optional, Tuple, Type
 from pathlib import Path
 
-import ujson
+import orjson
 
 from .abc import DataContainer, DataContainerHolder
 from .enums import Resource
@@ -168,12 +168,12 @@ class TroopHolder(DataContainerHolder):
     item_lookup: Dict[Tuple[str, bool], Type[Troop]]
 
     def _load_json(self, english_aliases: dict, lab_to_townhall):
-        with open(TROOPS_FILE_PATH) as fp:
-            troop_data = ujson.load(fp)
-        with open(SUPER_TROOPS_FILE_PATH) as fp:
-            super_troop_data = ujson.load(fp)
-        with open(ARMY_LINK_ID_FILE_PATH) as fp:
-            army_link_ids: dict = ujson.load(fp)
+        with open(TROOPS_FILE_PATH, 'rb') as fp:
+            troop_data = orjson.loads(fp.read())
+        with open(SUPER_TROOPS_FILE_PATH, 'rb') as fp:
+            super_troop_data = orjson.loads(fp.read())
+        with open(ARMY_LINK_ID_FILE_PATH, 'rb') as fp:
+            army_link_ids: dict = orjson.loads(fp.read())
 
         super_data: dict = {v["Replacement"]: v for item in super_troop_data.values() for v in item.values()}
 

requirements.txt

@@ -1,3 +1,3 @@
 aiohttp
-ujson
-zstandard
+orjson
+zstandard

tests/test_capitalraidseasons.py

@@ -2,7 +2,7 @@
 import unittest
 from pathlib import Path
 
-import ujson
+import orjson
 
 from coc import RaidLogEntry, RaidClan, RaidAttack, RaidMember
 from coc.entry_logs import RaidLog
@@ -11,9 +11,8 @@
 
 tracemalloc.start()
 
-with open(Path(__file__).parent.joinpath(Path("mockdata/clans/capitalraidseasons/CAPITALRAIDSEASON.json")),
-          encoding="utf-8") as fp:
-	MOCK_CAPITALRAIDSEASON = ujson.load(fp)
+with open(Path(__file__).parent.joinpath(Path("mockdata/clans/capitalraidseasons/CAPITALRAIDSEASON.json")),'rb') as fp:
+	MOCK_CAPITALRAIDSEASON = orjson.loads(fp.read())
 
 
 class TestRaids(unittest.TestCase):

tests/test_clans.py

@@ -1,7 +1,7 @@
 import unittest
 from pathlib import Path
 
-import ujson
+import orjson
 
 from coc.clans import Clan
 from coc.miscmodels import Location, Label, BaseLeague, ChatLanguage, CapitalDistrict
@@ -11,11 +11,11 @@
 
 tracemalloc.start()
 
-with open(Path(__file__).parent.joinpath(Path("mockdata/clans/clans/CLAN.json")), encoding="utf-8") as fp:
-	MOCK_CLAN = ujson.load(fp)
+with open(Path(__file__).parent.joinpath(Path("mockdata/clans/clans/CLAN.json")), 'rb') as fp:
+	MOCK_CLAN = orjson.loads(fp.read())
 
-with open(Path(__file__).parent.joinpath(Path("mockdata/clans/search/CLANS_FOUND.json")), encoding="utf-8") as fp:
-	MOCK_SEARCH_CLAN = ujson.load(fp)
+with open(Path(__file__).parent.joinpath(Path("mockdata/clans/search/CLANS_FOUND.json")), 'rb') as fp:
+	MOCK_SEARCH_CLAN = orjson.loads(fp.read())
 
 
 class TestClans(unittest.TestCase):