Fixed imports order

fs_uae_wrapper/archive.py

@@ -7,8 +7,7 @@ the temporary one.
 import os
 import shutil
 
-from fs_uae_wrapper import base
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import base, utils
 
 
 class Wrapper(base.ArchiveBase):

fs_uae_wrapper/base.py

@@ -6,8 +6,7 @@ import os
 import shutil
 import tempfile
 
-from fs_uae_wrapper import utils
-from fs_uae_wrapper import path
+from fs_uae_wrapper import path, utils
 
 
 class Base(object):

fs_uae_wrapper/file_archive.py

@@ -1,10 +1,10 @@
 """
 File archive classes
 """
-import os
-import subprocess
-import re
 import logging
+import os
+import re
+import subprocess
 
 from fs_uae_wrapper import path
 

fs_uae_wrapper/plain.py

@@ -2,8 +2,7 @@
 Simple class for executing fs-uae with specified parameters. This is a
 failsafe class for running fs-uae.
 """
-from fs_uae_wrapper import base
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import base, utils
 
 
 class Wrapper(base.Base):

fs_uae_wrapper/utils.py

@@ -8,8 +8,7 @@ import pathlib
 import shutil
 import subprocess
 
-from fs_uae_wrapper import message
-from fs_uae_wrapper import file_archive
+from fs_uae_wrapper import file_archive, message
 
 
 class CmdOption(dict):

fs_uae_wrapper/whdload.py

@@ -6,8 +6,7 @@ It will use compressed base image and compressed directories.
 import logging
 import os
 
-from fs_uae_wrapper import base
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import base, utils
 
 
 class Wrapper(base.ArchiveBase):

fs_uae_wrapper/wrapper.py

@@ -7,8 +7,7 @@ import logging
 import os
 import sys
 
-from fs_uae_wrapper import utils
-from fs_uae_wrapper import WRAPPER_KEY
+from fs_uae_wrapper import WRAPPER_KEY, utils
 
 
 def setup_logger(options):

pyproject.toml

@@ -38,3 +38,11 @@ py-modules = ["fs_uae_wrapper"]
 
 [tool.distutils.bdist_wheel]
 universal = true
+
+[tool.ruff.lint]
+select = [
+    "F",   # pyflakes
+    "E",   # pycodestyle
+    "I",   # isort
+    "RUF", # ruff-specific rules
+]

tests/test_archive.py

@@ -1,11 +1,9 @@
 import os
 import shutil
 from tempfile import mkdtemp
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
-from fs_uae_wrapper import archive
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import archive, utils
 
 
 class TestArchive(TestCase):

tests/test_base.py

@@ -1,12 +1,10 @@
 import os
-import sys
 import shutil
-from tempfile import mkstemp, mkdtemp
-from unittest import TestCase
-from unittest import mock
+import sys
+from tempfile import mkdtemp, mkstemp
+from unittest import TestCase, mock
 
-from fs_uae_wrapper import base
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import base, utils
 
 
 class TestBase(TestCase):

tests/test_cd32.py

@@ -1,8 +1,6 @@
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
-from fs_uae_wrapper import cd32
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import cd32, utils
 
 
 class TestCD32(TestCase):

tests/test_file_archive.py

@@ -1,8 +1,7 @@
 import os
 import shutil
 from tempfile import mkdtemp
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
 from fs_uae_wrapper import file_archive
 

tests/test_message.py

@@ -1,6 +1,5 @@
-from unittest import TestCase
 import os
-from unittest import mock
+from unittest import TestCase, mock
 
 from fs_uae_wrapper import message
 

tests/test_plain.py

@@ -1,8 +1,6 @@
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
-from fs_uae_wrapper import plain
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import plain, utils
 
 
 class TestPlainModule(TestCase):

tests/test_savestate.py

@@ -1,11 +1,9 @@
 import os
 import shutil
 from tempfile import mkdtemp
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
-from fs_uae_wrapper import savestate
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import savestate, utils
 
 
 class TestSaveState(TestCase):

tests/test_utils.py

@@ -1,9 +1,8 @@
 import os
-import sys
-from tempfile import mkstemp, mkdtemp
-from unittest import TestCase
 import shutil
-from unittest import mock
+import sys
+from tempfile import mkdtemp, mkstemp
+from unittest import TestCase, mock
 
 from fs_uae_wrapper import utils
 

tests/test_whdload.py

@@ -1,11 +1,9 @@
 import os
 import shutil
 from tempfile import mkdtemp
-from unittest import TestCase
-from unittest import mock
+from unittest import TestCase, mock
 
-from fs_uae_wrapper import whdload
-from fs_uae_wrapper import utils
+from fs_uae_wrapper import utils, whdload
 
 
 class TestWHDLoad(TestCase):

tests/test_wrapper.py

@@ -1,9 +1,8 @@
 import os
-import sys
-from tempfile import mkstemp, mkdtemp
-from unittest import TestCase
 import shutil
-from unittest import mock
+import sys
+from tempfile import mkdtemp, mkstemp
+from unittest import TestCase, mock
 
 from fs_uae_wrapper import wrapper