From 24f8fee432946ea7793ed714ea5ae9886d3691bf Mon Sep 17 00:00:00 2001 From: Mathieu Comandon Date: Sat, 24 Feb 2024 21:14:32 -0800 Subject: [PATCH] Re-enable imports sorting --- lutris/gui/application.py | 23 +++++++++++------------ lutris/gui/dialogs/webconnect_dialog.py | 1 - lutris/util/audio.py | 2 -- ruff.toml | 1 - tests/test_utils.py | 2 +- utils/clean_configs.py | 1 + 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lutris/gui/application.py b/lutris/gui/application.py index f0543b4c9..a4b2379c7 100644 --- a/lutris/gui/application.py +++ b/lutris/gui/application.py @@ -22,7 +22,6 @@ import os import signal import sys import tempfile - from datetime import datetime, timedelta from gettext import gettext as _ from typing import List @@ -32,34 +31,34 @@ import gi gi.require_version("Gdk", "3.0") gi.require_version("Gtk", "3.0") -from gi.repository import Gio, GLib, Gtk, GObject +from gi.repository import Gio, GLib, GObject, Gtk -from lutris.runners import get_runner_names, import_runner, InvalidRunnerError, RunnerInstallationError from lutris import settings -from lutris.api import parse_installer_url, get_runners +from lutris.api import get_runners, parse_installer_url from lutris.command import exec_command from lutris.database import games as games_db +from lutris.database.services import ServiceGameCollection +from lutris.exception_backstops import init_exception_backstops from lutris.game import Game, export_game, import_game -from lutris.installer import get_installers from lutris.gui.config.preferences_dialog import PreferencesDialog from lutris.gui.dialogs import ErrorDialog, InstallOrPlayDialog, NoticeDialog +from lutris.gui.dialogs.delegates import CommandLineUIDelegate, InstallUIDelegate, LaunchUIDelegate from lutris.gui.dialogs.issue import IssueReportWindow -from lutris.gui.dialogs.delegates import LaunchUIDelegate, InstallUIDelegate, CommandLineUIDelegate -from lutris.gui.installerwindow import InstallerWindow, InstallationKind +from lutris.gui.installerwindow import InstallationKind, InstallerWindow from lutris.gui.widgets.status_icon import LutrisStatusIcon +from lutris.installer import get_installers from lutris.migrations import migrate +from lutris.runners import InvalidRunnerError, RunnerInstallationError, get_runner_names, import_runner +from lutris.services import get_enabled_services from lutris.startup import init_lutris, run_all_checks from lutris.style_manager import StyleManager from lutris.util import datapath, log, system from lutris.util.http import HTTPError, Request +from lutris.util.jobs import AsyncCall from lutris.util.log import logger +from lutris.util.savesync import save_check, show_save_stats, upload_save from lutris.util.steam.appmanifest import AppManifest, get_appmanifests from lutris.util.steam.config import get_steamapps_dirs -from lutris.util.savesync import show_save_stats, upload_save, save_check -from lutris.services import get_enabled_services -from lutris.database.services import ServiceGameCollection -from lutris.util.jobs import AsyncCall -from lutris.exception_backstops import init_exception_backstops from .lutriswindow import LutrisWindow diff --git a/lutris/gui/dialogs/webconnect_dialog.py b/lutris/gui/dialogs/webconnect_dialog.py index 01a0517bc..35f7100cf 100644 --- a/lutris/gui/dialogs/webconnect_dialog.py +++ b/lutris/gui/dialogs/webconnect_dialog.py @@ -12,7 +12,6 @@ from gi.repository import WebKit2 from lutris.gui.dialogs import ModalDialog - DEFAULT_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0" diff --git a/lutris/util/audio.py b/lutris/util/audio.py index 1cced3cdd..e258415d6 100644 --- a/lutris/util/audio.py +++ b/lutris/util/audio.py @@ -1,8 +1,6 @@ """Whatever it is we want to do with audio module""" -# Standard Library import time -# Lutris Modules from lutris.util import system from lutris.util.log import logger diff --git a/ruff.toml b/ruff.toml index 71e77ee87..6f22f0255 100644 --- a/ruff.toml +++ b/ruff.toml @@ -22,7 +22,6 @@ ignore = [ "B024", # `DiscordRichPresenceBase` is an abstract base class, but it has no abstract methods "B905", # `zip()` without an explicit `strict=` parameter "ARG002", # Unused method argument: `mock_path_exists` - "I001", # Import block is un-sorted or un-formatted "E722", # Do not use bare `except` "B904", # Within an `except` clause, raise exceptions with `raise ... from err` or `raise ... from None` to distinguish them from errors in exception handling "B008", # Do not perform function call `_try_import_moddb_library` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable diff --git a/tests/test_utils.py b/tests/test_utils.py index f5814bccb..6e49ee2c6 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -2,9 +2,9 @@ import os from collections import OrderedDict from unittest import TestCase -from lutris.util.wine import wine from lutris.util import fileio, strings, system from lutris.util.steam import vdfutils +from lutris.util.wine import wine class TestFileUtils(TestCase): diff --git a/utils/clean_configs.py b/utils/clean_configs.py index 2fdf9838b..09775589a 100644 --- a/utils/clean_configs.py +++ b/utils/clean_configs.py @@ -1,4 +1,5 @@ import os + from lutris.database.games import get_games CONFIG_DIR = os.path.expanduser("~/.config/lutris/games")