chore(python): Optimize imports

Signed-off-by: txtsd <[email protected]>

hooks/monthly.py

@@ -4,9 +4,10 @@
 #
 # To use, copy this file to ~/.trackma/hooks/ and fill in the access token.
 
+import json
 import urllib.parse
 import urllib.request
-import json
+
 import trackma.utils as utils
 
 ACCESS_TOKEN = ""

hooks/notification.py

@@ -9,7 +9,6 @@
 # To use, copy this file to ~/.trackma/hooks/
 
 import os
-import trackma.utils as utils
 
 
 def episode_changed(engine, show):

hooks/presence.py

@@ -7,15 +7,15 @@
  use images from pypresence-assets dir
  when creating discord application
 """
-import time
 import os
-
+import time
+from asyncio import new_event_loop as new_loop
+from asyncio import set_event_loop as set_loop
 from threading import Thread
-from asyncio import (
-    new_event_loop as new_loop,
-    set_event_loop as set_loop)
+
 from pypresence.client import Client
 from pypresence.exceptions import InvalidID, InvalidPipe
+
 from trackma.utils import estimate_aired_episodes
 
 

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
+
 from trackma import utils
 
 try:

tests/test_anime_info_extractor.py

@@ -1,7 +1,5 @@
 from pprint import pprint
 
-# import pytest
-
 from trackma.extras import AnimeInfoExtractor
 
 DEFAULTS = {

trackma/accounts.py

@@ -1,4 +1,5 @@
 import pickle
+
 from trackma import utils
 
 

trackma/engine.py

@@ -14,20 +14,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import re
-import os
-import sys
-import subprocess
-import difflib
-import time
 import datetime
+import os
 import random
+import re
 import shlex
 import shutil
+import sys
+import time
 from decimal import Decimal
 
-from trackma import messenger
 from trackma import data
+from trackma import messenger
 from trackma import utils
 from trackma.extras import AnimeInfoExtractor
 from trackma.extras import redirections

trackma/extras/redirections.py

@@ -14,8 +14,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from trackma import utils
-
 SUPPORTED_APIS = ['mal', 'kitsu', 'anilist']
 SUPPORTED_MEDIATYPES = ['anime']
 

trackma/lib/libanilist.py

@@ -14,16 +14,15 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+import datetime
 import json
+import socket
 import urllib.error
 import urllib.parse
 import urllib.request
-import socket
-import time
-import datetime
 
-from trackma.lib.lib import lib
 from trackma import utils
+from trackma.lib.lib import lib
 
 
 class libanilist(lib):

trackma/lib/libkitsu.py

@@ -16,20 +16,21 @@
 #
 
 import datetime
+import gzip
+import json
+import socket
 import time
 import urllib.error
 import urllib.parse
 import urllib.request
-import json
-import gzip
-import socket
+
+from trackma import utils
+from trackma.lib.lib import lib
+
 
 # import http.client
 # http.client.HTTPConnection.debuglevel = 1
 
-from trackma.lib.lib import lib
-from trackma import utils
-
 
 class libkitsu(lib):
     """

trackma/lib/libmal.py

@@ -14,17 +14,17 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+import datetime
 import gzip
 import json
+import socket
+import time
 import urllib.error
 import urllib.parse
 import urllib.request
-import socket
-import time
-import datetime
 
-from trackma.lib.lib import lib
 from trackma import utils
+from trackma.lib.lib import lib
 
 
 class libmal(lib):

trackma/lib/libshikimori.py

@@ -15,14 +15,14 @@
 #
 
 import json
+import socket
+import time
 import urllib.error
 import urllib.parse
 import urllib.request
-import socket
-import time
 
-from trackma.lib.lib import lib
 from trackma import utils
+from trackma.lib.lib import lib
 
 
 class libshikimori(lib):

trackma/lib/libvndb.py

@@ -14,13 +14,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import socket
-import json
 import datetime
+import json
+import socket
 import ssl
 
-from trackma.lib.lib import lib
 from trackma import utils
+from trackma.lib.lib import lib
 
 
 class libvndb(lib):

trackma/tracker/inotify.py

@@ -18,8 +18,8 @@
 import inotify.adapters
 import inotify.constants
 
-from trackma.tracker import inotifyBase
 from trackma import utils
+from trackma.tracker import inotifyBase
 
 
 class inotifyTracker(inotifyBase.inotifyBase):

trackma/tracker/inotifyBase.py

@@ -18,8 +18,8 @@
 import re
 import time
 
-from trackma.tracker import tracker
 from trackma import utils
+from trackma.tracker import tracker
 
 
 class inotifyBase(tracker.TrackerBase):

trackma/tracker/jellyfin.py

@@ -15,8 +15,9 @@
 
 # TODO: Add gui stuff for this
 
-import time
 import os
+import time
+
 import requests
 
 from trackma.tracker import tracker

trackma/tracker/kodi.py

@@ -14,13 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import time
-import json
 import base64
-import urllib.request
+import json
+import time
 import urllib.error
+import urllib.request
 
-import trackma.utils as utils
 from trackma.tracker import tracker
 
 NOT_RUNNING = 0

trackma/tracker/mpris.py

@@ -18,11 +18,11 @@
 import re
 import urllib.parse
 
-from pydbus import SessionBus
 from gi.repository import GLib
+from pydbus import SessionBus
 
-from trackma.tracker import tracker
 from trackma import utils
+from trackma.tracker import tracker
 
 
 class MPRISTracker(tracker.TrackerBase):

trackma/tracker/polling.py

@@ -14,13 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import time
-import re
 import os
 import subprocess
+import time
 
-from trackma.tracker import tracker
 from trackma import utils
+from trackma.tracker import tracker
 
 
 class PollingTracker(tracker.TrackerBase):

trackma/tracker/pyinotify.py

@@ -16,8 +16,8 @@
 
 import pyinotify
 
-from trackma.tracker import inotifyBase
 from trackma import utils
+from trackma.tracker import inotifyBase
 
 
 class pyinotifyTracker(inotifyBase.inotifyBase):

trackma/tracker/tracker.py

@@ -14,14 +14,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import os
 import threading
-import re
 import time
-import os
-
-import ctypes
 
-from trackma import messenger
 from trackma import utils
 from trackma.extras import AnimeInfoExtractor
 

trackma/tracker/win32.py

@@ -15,8 +15,8 @@
 #
 
 import ctypes
-import time
 import re
+import time
 
 from trackma.tracker import tracker
 

trackma/ui/cli.py

@@ -14,28 +14,27 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import sys
+import argparse
+import cmd as command
 import os
+import re
+import shlex
 import subprocess
+import sys
+import textwrap
+from operator import itemgetter  # Used for sorting list
+
+from trackma import messenger
+from trackma import utils
+from trackma.accounts import AccountManager
+from trackma.engine import Engine
 
 try:
     import readline
     has_readline = True
 except ImportError:
     has_readline = False
 
-import cmd as command
-import shlex
-import textwrap
-import re
-import argparse
-from operator import itemgetter  # Used for sorting list
-
-from trackma.engine import Engine
-from trackma.accounts import AccountManager
-from trackma import messenger
-from trackma import utils
-
 _COLOR_RESET = '\033[0m'
 _COLOR_ENGINE = '\033[0;32m'
 _COLOR_DATA = '\033[0;33m'

trackma/ui/curses.py

@@ -14,9 +14,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import sys
 import os
+import re
 import subprocess
+import sys
+import webbrowser
+from itertools import cycle
+from operator import itemgetter
+
+from trackma import messenger
+from trackma import utils
+from trackma.accounts import AccountManager
+from trackma.engine import Engine
 
 try:
     import urwid
@@ -25,17 +34,6 @@
           "urwid package.")
     sys.exit(-1)
 
-import re
-import urwid
-import webbrowser
-from operator import itemgetter
-from itertools import cycle
-
-from trackma.engine import Engine
-from trackma.accounts import AccountManager
-from trackma import messenger
-from trackma import utils
-
 
 class Trackma_urwid:
     """