From a83e96528f53e4c4a5905355e0bf2f79ec23947c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 18 Jul 2021 10:33:08 +0200 Subject: [PATCH] Apply isort. --- __init__.py | 2 +- basic_features/basic_save_game_info.py | 5 ++--- basic_game.py | 6 ++---- games/game_dao.py | 7 ++++--- games/game_darkestdungeon.py | 2 +- games/game_darkmessiahofmightandmagic.py | 2 +- games/game_divinityoriginalsin.py | 2 +- games/game_divinityoriginalsinee.py | 4 ++-- games/game_kerbalspaceprogram.py | 11 ++++++----- games/game_kingdomcomedeliverance.py | 5 +++-- games/game_mountandblade2.py | 4 ++-- games/game_msfs2020.py | 6 +++--- games/game_stalkeranomaly.py | 2 +- games/game_witcher3.py | 8 ++++---- games/game_zeusandposeidon.py | 2 +- gog_utils.py | 1 - setup.cfg | 7 +++++++ steam_utils.py | 1 - 18 files changed, 41 insertions(+), 36 deletions(-) diff --git a/__init__.py b/__init__.py index 3529cb8..8bef10f 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- -import importlib import glob +import importlib import os import sys import typing diff --git a/basic_features/basic_save_game_info.py b/basic_features/basic_save_game_info.py index 762891d..103937c 100644 --- a/basic_features/basic_save_game_info.py +++ b/basic_features/basic_save_game_info.py @@ -1,13 +1,12 @@ # -*- encoding: utf-8 -*- import sys - from pathlib import Path from typing import Callable, List, Optional from PyQt5.QtCore import QDateTime, Qt -from PyQt5.QtGui import QPixmap, QImage -from PyQt5.QtWidgets import QLabel, QWidget, QVBoxLayout +from PyQt5.QtGui import QImage, QPixmap +from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget import mobase diff --git a/basic_game.py b/basic_game.py index cdecf0a..42457d2 100644 --- a/basic_game.py +++ b/basic_game.py @@ -1,10 +1,8 @@ # -*- encoding: utf-8 -*- import shutil - from pathlib import Path -from typing import List, Union, Optional, TypeVar, Callable, Generic, Dict - +from typing import Callable, Dict, Generic, List, Optional, TypeVar, Union from PyQt5.QtCore import QDir, QFileInfo, QStandardPaths from PyQt5.QtGui import QIcon @@ -315,8 +313,8 @@ class BasicGame(mobase.IPluginGame): @staticmethod def setup(): - from .steam_utils import find_games as find_steam_games from .gog_utils import find_games as find_gog_games + from .steam_utils import find_games as find_steam_games BasicGame.steam_games = find_steam_games() BasicGame.gog_games = find_gog_games() diff --git a/games/game_dao.py b/games/game_dao.py index d464c76..6755da0 100644 --- a/games/game_dao.py +++ b/games/game_dao.py @@ -1,8 +1,9 @@ -from ..basic_game import BasicGame -from ..basic_features import BasicGameSaveGameInfo +import os import mobase -import os + +from ..basic_features import BasicGameSaveGameInfo +from ..basic_game import BasicGame class DAOriginsGame(BasicGame): diff --git a/games/game_darkestdungeon.py b/games/game_darkestdungeon.py index 5c4fcbd..2eb2dd1 100644 --- a/games/game_darkestdungeon.py +++ b/games/game_darkestdungeon.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- +import json from pathlib import Path from typing import List -import json from PyQt5.QtCore import QDir, QFileInfo, QStandardPaths diff --git a/games/game_darkmessiahofmightandmagic.py b/games/game_darkmessiahofmightandmagic.py index 47d02f8..bf25ae3 100644 --- a/games/game_darkmessiahofmightandmagic.py +++ b/games/game_darkmessiahofmightandmagic.py @@ -6,8 +6,8 @@ from PyQt5.QtGui import QImage import mobase -from ..basic_game import BasicGame from ..basic_features import BasicGameSaveGameInfo +from ..basic_game import BasicGame class DarkMessiahOfMightAndMagicGame(BasicGame): diff --git a/games/game_divinityoriginalsin.py b/games/game_divinityoriginalsin.py index 1a9c62b..3633c09 100644 --- a/games/game_divinityoriginalsin.py +++ b/games/game_divinityoriginalsin.py @@ -2,8 +2,8 @@ import mobase -from ..basic_game import BasicGame from ..basic_features import BasicGameSaveGameInfo +from ..basic_game import BasicGame class DivinityOriginalSinGame(BasicGame): diff --git a/games/game_divinityoriginalsinee.py b/games/game_divinityoriginalsinee.py index bc8ccbb..52da6d0 100644 --- a/games/game_divinityoriginalsinee.py +++ b/games/game_divinityoriginalsinee.py @@ -1,12 +1,12 @@ # -*- encoding: utf-8 -*- -from typing import List, Optional import os +from typing import List, Optional import mobase -from ..basic_game import BasicGame from ..basic_features import BasicGameSaveGameInfo +from ..basic_game import BasicGame class DivinityOriginalSinEnhancedEditionModDataChecker(mobase.ModDataChecker): diff --git a/games/game_kerbalspaceprogram.py b/games/game_kerbalspaceprogram.py index fa338d5..6cf934c 100644 --- a/games/game_kerbalspaceprogram.py +++ b/games/game_kerbalspaceprogram.py @@ -1,11 +1,12 @@ -import mobase - -from ..basic_game import BasicGame -from ..basic_features.basic_save_game_info import BasicGameSaveGame -from ..basic_features import BasicGameSaveGameInfo from os import path from pathlib import Path +import mobase + +from ..basic_features import BasicGameSaveGameInfo +from ..basic_features.basic_save_game_info import BasicGameSaveGame +from ..basic_game import BasicGame + class KerbalSpaceProgramSaveGame(BasicGameSaveGame): def allFiles(self): diff --git a/games/game_kingdomcomedeliverance.py b/games/game_kingdomcomedeliverance.py index 3d0a493..6487b6b 100644 --- a/games/game_kingdomcomedeliverance.py +++ b/games/game_kingdomcomedeliverance.py @@ -1,10 +1,11 @@ # -*- encoding: utf-8 -*- -from ..basic_game import BasicGame - import os + from PyQt5.QtCore import QDir +from ..basic_game import BasicGame + class KingdomComeDeliveranceGame(BasicGame): Name = "Kingdom Come Deliverance Support Plugin" diff --git a/games/game_mountandblade2.py b/games/game_mountandblade2.py index 0228632..fc8fd96 100644 --- a/games/game_mountandblade2.py +++ b/games/game_mountandblade2.py @@ -1,9 +1,9 @@ # -*- encoding: utf-8 -*- -from PyQt5.QtCore import QFileInfo - from typing import List +from PyQt5.QtCore import QFileInfo + import mobase from ..basic_game import BasicGame diff --git a/games/game_msfs2020.py b/games/game_msfs2020.py index 8057534..028ae19 100644 --- a/games/game_msfs2020.py +++ b/games/game_msfs2020.py @@ -1,9 +1,9 @@ -from ..basic_game import BasicGame +import os +import re from PyQt5.QtCore import QDir -import os -import re +from ..basic_game import BasicGame class MSFS2020Game(BasicGame): diff --git a/games/game_stalkeranomaly.py b/games/game_stalkeranomaly.py index 87a10cf..51762c4 100644 --- a/games/game_stalkeranomaly.py +++ b/games/game_stalkeranomaly.py @@ -7,8 +7,8 @@ from PyQt5.QtCore import QDir, QFileInfo import mobase -from ..basic_game import BasicGame from ..basic_features.basic_save_game_info import BasicGameSaveGame +from ..basic_game import BasicGame class StalkerAnomalyModDataChecker(mobase.ModDataChecker): diff --git a/games/game_witcher3.py b/games/game_witcher3.py index 212e9b3..781939a 100644 --- a/games/game_witcher3.py +++ b/games/game_witcher3.py @@ -1,15 +1,15 @@ # -*- encoding: utf-8 -*- -import mobase - from pathlib import Path from typing import List from PyQt5.QtCore import QDir -from ..basic_game import BasicGame -from ..basic_features.basic_save_game_info import BasicGameSaveGame +import mobase + from ..basic_features import BasicGameSaveGameInfo +from ..basic_features.basic_save_game_info import BasicGameSaveGame +from ..basic_game import BasicGame class Witcher3SaveGame(BasicGameSaveGame): diff --git a/games/game_zeusandposeidon.py b/games/game_zeusandposeidon.py index 6794e65..369c3df 100644 --- a/games/game_zeusandposeidon.py +++ b/games/game_zeusandposeidon.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- -from typing import Optional, List +from typing import List, Optional import mobase diff --git a/gog_utils.py b/gog_utils.py index 3c11e41..713015c 100644 --- a/gog_utils.py +++ b/gog_utils.py @@ -4,7 +4,6 @@ # https://github.com/ModOrganizer2/modorganizer-basic_games/pull/5 import winreg # type: ignore - from pathlib import Path from typing import Dict diff --git a/setup.cfg b/setup.cfg index cdc00fb..bcca8db 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,6 +5,13 @@ extend-ignore = # See https://github.com/PyCQA/pycodestyle/issues/373 E203, E266 +[isort] +profile = black +multi_line_output = 3 +known_mobase = mobase +sections=FUTURE,STDLIB,THIRDPARTY,MOBASE,FIRSTPARTY,LOCALFOLDER + + [mypy] warn_return_any = True warn_unused_configs = True diff --git a/steam_utils.py b/steam_utils.py index dafa563..7ccb0d2 100644 --- a/steam_utils.py +++ b/steam_utils.py @@ -4,7 +4,6 @@ import sys import winreg # type: ignore - from pathlib import Path from typing import Dict, List, Optional