sort imports with isort

fishy/__main__.py

@@ -3,16 +3,17 @@ import logging
 import os
 import sys
 import traceback
+
 import win32con
 import win32gui
 
 import fishy
-from fishy import web, helper, gui
+from fishy import gui, helper, web
+from fishy.constants import chalutier, lam2
 from fishy.engine.common.event_handler import EngineEventHandler
 from fishy.gui import GUI, splash, update_dialog
 from fishy.helper import hotkey
 from fishy.helper.config import config
-from fishy.constants import chalutier, lam2
 
 
 def check_window_name(title):

fishy/engine/common/window.py

@@ -5,7 +5,7 @@ import cv2
 import imutils
 
 from fishy.engine.common import window_server
-from fishy.engine.common.window_server import WindowServer, Status
+from fishy.engine.common.window_server import Status, WindowServer
 from fishy.helper import helper
 
 

fishy/engine/common/window_server.py

@@ -1,16 +1,14 @@
 import logging
+import math
 from enum import Enum
 from threading import Thread
 
 import cv2
-import math
+import numpy as np
-
 import pywintypes
 import win32gui
-from win32api import GetSystemMetrics
-
-import numpy as np
 from PIL import ImageGrab
+from win32api import GetSystemMetrics
 
 from fishy.helper.config import config
 

fishy/engine/fullautofisher/calibrator.py

@@ -1,13 +1,12 @@
-import math
 import logging
+import math
 import time
 
 import cv2
 import numpy as np
-
-from fishy.engine.fullautofisher.engine import FullAuto
 from pynput import keyboard, mouse
 
+from fishy.engine.fullautofisher.engine import FullAuto
 from fishy.helper.config import config
 
 mse = mouse.Controller()

fishy/engine/fullautofisher/controls.py

@@ -1,14 +1,13 @@
 import logging
 
-from fishy.helper import hotkey
-
 from fishy.engine.fullautofisher.engine import FullAuto, State
+from fishy.helper import hotkey
 from fishy.helper.hotkey import Key
 
 
 def get_controls(engine: FullAuto):
-    from fishy.engine.fullautofisher.recorder import Recorder
     from fishy.engine.fullautofisher.player import Player
+    from fishy.engine.fullautofisher.recorder import Recorder
     controls = [
         ("MODE_SELECT", {
             Key.RIGHT: (Recorder(engine).toggle_recording, "start/stop record"),

fishy/engine/fullautofisher/engine.py

@@ -1,24 +1,22 @@
+import logging
 import math
+import time
 import traceback
 from enum import Enum
 from threading import Thread
 
 import cv2
-import logging
-import time
-
-from fishy.constants import libgps, fishyqr, lam2
-from fishy.engine.fullautofisher.qr_detection import get_values_from_image, get_qr_location
-from fishy.engine.semifisher.fishing_mode import FishingMode
-
-from fishy.engine import SemiFisherEngine
-from fishy.engine.common.window import WindowClient
-from fishy.engine.semifisher import fishing_mode, fishing_event
-
-from fishy.engine.common.IEngine import IEngine
 from pynput import keyboard, mouse
 
-from fishy.helper import hotkey, helper
+from fishy.constants import fishyqr, lam2, libgps
+from fishy.engine import SemiFisherEngine
+from fishy.engine.common.IEngine import IEngine
+from fishy.engine.common.window import WindowClient
+from fishy.engine.fullautofisher.qr_detection import (get_qr_location,
+                                                      get_values_from_image)
+from fishy.engine.semifisher import fishing_event, fishing_mode
+from fishy.engine.semifisher.fishing_mode import FishingMode
+from fishy.helper import helper, hotkey
 from fishy.helper.helper import sign
 
 mse = mouse.Controller()
@@ -46,9 +44,9 @@ class FullAuto(IEngine):
     state = State.NONE
 
     def __init__(self, gui_ref):
-        from fishy.engine.fullautofisher.controls import Controls
         from fishy.engine.fullautofisher import controls
         from fishy.engine.fullautofisher.calibrator import Calibrator
+        from fishy.engine.fullautofisher.controls import Controls
         from fishy.engine.fullautofisher.test import Test
 
         super().__init__(gui_ref)

fishy/engine/fullautofisher/player.py

@@ -2,10 +2,8 @@ import logging
 import pickle
 from pprint import pprint
 
-from fishy.engine.semifisher import fishing_event, fishing_mode
-
 from fishy.engine.fullautofisher.engine import FullAuto, State
-
+from fishy.engine.semifisher import fishing_event, fishing_mode
 from fishy.helper import helper
 from fishy.helper.config import config
 

fishy/engine/fullautofisher/qr_detection.py

@@ -3,12 +3,11 @@ import os
 from datetime import datetime
 
 import cv2
-
-from fishy.helper.helper import get_documents
-
 import numpy as np
 from pyzbar.pyzbar import decode
 
+from fishy.helper.helper import get_documents
+
 
 def get_qr_location(og_img):
     """

fishy/engine/fullautofisher/recorder.py

@@ -5,7 +5,6 @@ from pprint import pprint
 from tkinter.filedialog import asksaveasfile
 
 from fishy.engine.fullautofisher.engine import FullAuto, State
-
 from fishy.helper.hotkey import Key
 from fishy.helper.hotkey_process import HotKey
 

fishy/engine/semifisher/engine.py

@@ -1,20 +1,18 @@
+import logging
 import time
 import typing
-import logging
 from threading import Thread
-from typing import Callable
+from typing import Callable, Optional
-from typing import Optional
+
 from playsound import playsound
 
-from fishy.engine.common.window import WindowClient
-from fishy.engine.semifisher.fishing_mode import Colors, FishingMode
-
 from fishy.engine.common.IEngine import IEngine
+from fishy.engine.common.window import WindowClient
+from fishy.engine.semifisher import fishing_event, fishing_mode
 from fishy.engine.semifisher.fishing_event import FishEvent
-from fishy.engine.semifisher import fishing_mode, fishing_event
+from fishy.engine.semifisher.fishing_mode import Colors, FishingMode
 from fishy.engine.semifisher.pixel_loc import PixelLoc
 from fishy.helper import helper
-
 from fishy.helper.luaparser import sv_color_extract
 
 if typing.TYPE_CHECKING:

fishy/engine/semifisher/fishing_event.py

@@ -4,15 +4,16 @@ Defines different fishing modes (states) which acts as state for state machine
 also implements callbacks which is called when states are changed
 """
 import logging
-import time
 import random
+import time
+
 import keyboard
 from playsound import playsound
-from win32gui import GetWindowText, GetForegroundWindow
+from win32gui import GetForegroundWindow, GetWindowText
 
 from fishy import web
 from fishy.engine.semifisher import fishing_mode
-from fishy.engine.semifisher.fishing_mode import State, FishingMode
+from fishy.engine.semifisher.fishing_mode import FishingMode, State
 from fishy.helper import helper
 from fishy.helper.config import config
 

fishy/gui/config_top.py

@@ -1,15 +1,12 @@
 import logging
 import os
+import tkinter as tk
+import tkinter.ttk as ttk
 import typing
 from tkinter.filedialog import askopenfilename
 
-from fishy.helper import helper
-
 from fishy import web
-
+from fishy.helper import helper
-import tkinter as tk
-import tkinter.ttk as ttk
-
 from fishy.helper.config import config
 from fishy.helper.popup import PopUp
 

fishy/gui/discord_login.py

@@ -1,12 +1,11 @@
 import time
 import tkinter as tk
 import tkinter.ttk as ttk
-
 import typing
 
+from fishy.libs.tkhtmlview import HTMLLabel
 from fishy.web import web
 
-from fishy.libs.tkhtmlview import HTMLLabel
 from ..helper.config import config
 
 if typing.TYPE_CHECKING:

fishy/gui/funcs.py

@@ -1,6 +1,5 @@
-from tkinter import messagebox
-
 import typing
+from tkinter import messagebox
 
 from fishy.helper.config import config
 

fishy/gui/gui.py

@@ -1,20 +1,21 @@
 import logging
-import uuid
-import tkinter as tk
-from typing import Callable, Optional, Dict, Any
 import queue
 import threading
+import tkinter as tk
+import uuid
+from typing import Any, Callable, Dict, Optional
 
-from fishy.web import web
 from ttkthemes import ThemedTk
 
 from fishy.engine.common.event_handler import EngineEventHandler
 from fishy.gui import config_top
 from fishy.gui.funcs import GUIFuncs
-from . import main_gui
+from fishy.web import web
-from .log_config import GUIStreamHandler
+
 from ..helper.config import config
 from ..helper.helper import wait_until
+from . import main_gui
+from .log_config import GUIStreamHandler
 
 
 class GUI:

fishy/gui/log_config.py

@@ -1,6 +1,5 @@
-from logging import StreamHandler
-
 import typing
+from logging import StreamHandler
 
 if typing.TYPE_CHECKING:
     from . import GUI

fishy/gui/main_gui.py

@@ -2,19 +2,18 @@ import logging
 import time
 import tkinter as tk
 import tkinter.ttk as ttk
+import typing
 
-from fishy.web import web
 from ttkthemes import ThemedTk
 
 from fishy import helper
-
-import typing
-
 from fishy.helper import hotkey
-from .discord_login import discord_login
+from fishy.web import web
+
+from ..constants import chalutier, lam2
 from ..helper.config import config
 from ..helper.hotkey import Key
-from ..constants import chalutier, lam2
+from .discord_login import discord_login
 
 if typing.TYPE_CHECKING:
     from . import GUI

fishy/gui/splash.py

@@ -1,10 +1,11 @@
 import time
-from multiprocessing import Process
 import tkinter as tk
+from multiprocessing import Process
+
 from PIL import Image, ImageTk
 
-from fishy.helper.config import config
 from fishy.helper import helper
+from fishy.helper.config import config
 
 
 def show(win_loc):

fishy/gui/terms_gui.py

@@ -1,7 +1,7 @@
-import webbrowser
+import re
 import tkinter as tk
 import tkinter.ttk as ttk
-import re
+import webbrowser
 
 from PIL import Image, ImageTk
 

fishy/gui/update_dialog.py

@@ -1,8 +1,9 @@
-from multiprocessing import Process, Manager
 import tkinter as tk
+from multiprocessing import Manager, Process
 
 from fishy import helper
 
+
 def show(currentversion, newversion, returns):
     top = tk.Tk()
     top.title("A wild fishy update appeared!")

fishy/helper/__init__.py

@@ -1,6 +1,9 @@
 from .auto_update import auto_upgrade, upgrade_avail, versions
 from .config import Config
-from .helper import open_web, initialize_uid, install_thread_excepthook, unhandled_exception_logging, manifest_file, \
+from .helper import (addon_exists, create_shortcut, create_shortcut_first,
-    create_shortcut_first, addon_exists, get_addonversion, install_addon, remove_addon, restart, create_shortcut, \
+                     get_addonversion, get_savedvarsdir, initialize_uid,
-    not_implemented, update, get_savedvarsdir, playsound_multiple
+                     install_addon, install_thread_excepthook, manifest_file,
+                     not_implemented, open_web, playsound_multiple,
+                     remove_addon, restart, unhandled_exception_logging,
+                     update)
 from .luaparser import sv_color_extract

fishy/helper/auto_update.py

@@ -11,6 +11,7 @@ from os import execl
 
 from bs4 import BeautifulSoup
 
+
 def _hr_version(v):
     return '.'.join([str(x) for x in v])
     #return str(v[0])+"."+str(v[1])+"."+str(v[2])

fishy/helper/config.py

@@ -4,9 +4,9 @@ Saves configuration in file as json file
 """
 import json
 import os
-
 # path to save the configuration file
 from typing import Optional
+
 from event_scheduler import EventScheduler
 
 

fishy/helper/helper.py

@@ -6,21 +6,19 @@ import threading
 import time
 import traceback
 import webbrowser
-import requests
+from hashlib import md5
-from playsound import playsound
 from io import BytesIO
 from threading import Thread
+from uuid import uuid1
 from zipfile import ZipFile
 
-from uuid import uuid1
+import requests
-from hashlib import md5
+import winshell
-
+from playsound import playsound
 from win32com.client import Dispatch
 from win32comext.shell import shell, shellcon
 
 import fishy
-import winshell
-
 from fishy import web
 
 

fishy/helper/hotkey.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from threading import Thread
-from typing import Dict, Callable, Optional
+from typing import Callable, Dict, Optional
 
 import keyboard
 

fishy/helper/hotkey_process.py

@@ -1,8 +1,8 @@
 import time
+from multiprocessing import Process, Queue
 from threading import Thread
 
 import mouse
-from multiprocessing import Process, Queue
 
 
 def event_triggered(queue, e):

fishy/helper/luaparser.py

@@ -1,6 +1,7 @@
-import os
 import logging
+import os
 from math import floor
+
 from .helper import get_savedvarsdir
 
 

fishy/web/__init__.py

@@ -1,2 +1,3 @@
 from .urls import get_notification_page, get_terms_page
-from .web import register_user, send_notification, send_fish_caught, is_subbed, unsub, get_session, sub
+from .web import (get_session, is_subbed, register_user, send_fish_caught,
+                  send_notification, sub, unsub)

fishy/web/web.py

@@ -3,10 +3,11 @@ from whatsmyip.ip import get_ip
 from whatsmyip.providers import GoogleDnsProvider
 
 from fishy import helper
+
+from ..constants import apiversion
+from ..helper.config import config
 from . import urls
 from .decorators import fallback, uses_session
-from ..helper.config import config
-from ..constants import apiversion
 
 _session_id = None
 

setup.py

@@ -4,14 +4,16 @@ https://packaging.python.org/guides/distributing-packages-using-setuptools/
 https://github.com/pypa/sampleproject
 """
 
-# Always prefer setuptools over distutils
-from setuptools import setup, find_packages
-from os import path
 # io.open is needed for projects that support Python 2.7
 # It ensures open() defaults to text mode with universal newlines,
 # and accepts an argument to specify the text encoding
 # Python 3 only projects can skip this import
 from io import open
+from os import path
+
+# Always prefer setuptools over distutils
+from setuptools import find_packages, setup
+
 from fishy import __version__
 
 here = path.abspath(path.dirname(__file__))