refactor: Merge

Author: zero-code-hero

.isort.cfg

@@ -1,2 +1,2 @@
 [settings]
-known_third_party = PIL,colorama,keyboard,requests
+known_third_party = PIL,attr,colorama,keyboard,requests

factories/item_modifier.py

@@ -1,12 +1,8 @@
 from typing import Dict
 
-from models.item_modifier import ItemModifier
 from enums.item_modifier_type import ItemModifierType
+from models.item_modifier import ItemModifier
 
 
 def build_from_json(blob: Dict) -> ItemModifier:
-    return ItemModifier(
-        id=blob['id'],
-        text=blob['text'],
-        type=ItemModifierType(blob['type'].lower())
-    )
+    return ItemModifier(id=blob["id"], text=blob["text"], type=ItemModifierType(blob["type"].lower()))

models/item_modifier.py

@@ -1,4 +1,4 @@
-from attr import attrs, attrib
+from attr import attrib, attrs
 
 from enums.item_modifier_type import ItemModifierType
 

parse.py

@@ -3,41 +3,30 @@
 import traceback
 from itertools import chain
 from tkinter import TclError, Tk
-from typing import Dict, List, Tuple, Any, Optional, Iterable, Collection
-from tkinter import TclError
-from tkinter import Tk
-from typing import Dict
-from typing import List
+from typing import Any, Collection, Dict, Iterable, List, Optional, Tuple
 
 import requests
-from colorama import Fore
-from colorama import deinit
-from colorama import init
+from colorama import Fore, deinit, init
 
 # Local imports
 from enums.item_modifier_type import ItemModifierType
 from models.item_modifier import ItemModifier
 from utils.config import LEAGUE, PROJECT_URL, USE_GUI, USE_HOTKEYS
-from utils.currency import (CATALYSTS, CURRENCY, DIV_CARDS, ESSENCES, FOSSILS,
-                            FRAGMENTS_AND_SETS, INCUBATORS, OILS, RESONATORS,
-                            SCARABS, VIALS)
-from utils.config import LEAGUE
-from utils.config import PROJECT_URL
-from utils.config import USE_GUI
-from utils.config import USE_HOTKEYS
-from utils.currency import CATALYSTS
-from utils.currency import CURRENCY
-from utils.currency import DIV_CARDS
-from utils.currency import ESSENCES
-from utils.currency import FOSSILS
-from utils.currency import FRAGMENTS_AND_SETS
-from utils.currency import INCUBATORS
-from utils.currency import OILS
-from utils.currency import RESONATORS
-from utils.currency import SCARABS
-from utils.currency import VIALS
+from utils.currency import (
+    CATALYSTS,
+    CURRENCY,
+    DIV_CARDS,
+    ESSENCES,
+    FOSSILS,
+    FRAGMENTS_AND_SETS,
+    INCUBATORS,
+    OILS,
+    RESONATORS,
+    SCARABS,
+    VIALS,
+)
 from utils.exceptions import InvalidAPIResponseException
-from utils.trade import get_leagues, get_item_modifiers
+from utils.trade import get_item_modifiers, get_leagues
 
 DEBUG = False
 
@@ -787,7 +776,6 @@ def get_mods_by_type(type: ItemModifierType) -> Iterable[ItemModifier]:
     if DEBUG:
         print("AFFIX:", affix)
 
-
     if re.search(r"\((pseudo|implicit|crafted)\)", affix):
         # Do these need to be searched in a specific order?
         search_order = [ItemModifierType.PSEUDO, ItemModifierType.IMPLICIT, ItemModifierType.CRAFTED]
@@ -808,7 +796,7 @@ def get_mods_by_type(type: ItemModifierType) -> Iterable[ItemModifier]:
             if value is not None:
                 return (enchant.id, value)
 
-    raise NotImplementedError('Unable to find matching affix.')
+    raise NotImplementedError("Unable to find matching affix.")
 
 
 def stat_translate(jaffix: str) -> ItemModifier:

pyproject.toml

@@ -40,7 +40,7 @@ exclude = '''
 '''
 
 [tool.isort]
-force_single_line = true
+force_single_line = false
 multi_line_output = 3
 include_trailing_comma = true
 force_grid_wrap = 0

utils/testGui.py

@@ -2,8 +2,7 @@
 import time
 from tkinter import *
 
-from PIL import Image
-from PIL import ImageTk
+from PIL import Image, ImageTk
 
 # We do not need this on Linux.
 # If you are attempting to develop, you will need to install your own version as pypi does not have one.

utils/trade.py

@@ -3,8 +3,8 @@
 
 import requests
 
-from models.item_modifier import ItemModifier
 from factories.item_modifier import build_from_json
+from models.item_modifier import ItemModifier
 
 
 def get_leagues() -> Tuple[str, ...]:
@@ -14,6 +14,5 @@ def get_leagues() -> Tuple[str, ...]:
 
 def get_item_modifiers() -> Tuple[ItemModifier, ...]:
     json_blob = requests.get(url="https://www.pathofexile.com/api/trade/data/stats").json()
-    items = tuple(chain(*[[build_from_json(y) for y in x['entries']] for x in json_blob['result']]))
+    items = tuple(chain(*[[build_from_json(y) for y in x["entries"]] for x in json_blob["result"]]))
     return items
-