Ruff enable F, W, I and run autofix

Author: fliiiix

pyproject.toml

@@ -2,7 +2,8 @@
 line-length = 120
 # Rule descriptions: https://docs.astral.sh/ruff/rules/
 # TODO enable more linter
-#lint.select = ["I", "E", "B", "F", "W", "N", "C4", "C90", "ARG", "PL", "RUF", "UP"]
+#lint.select = ["E", "B", "N", "C4", "C90", "ARG", "PL", "RUF", "UP"]
+lint.select = ["F", "W", "I"]
 
 [tool.ruff.lint.per-file-ignores]
 # Example ignore for all tests (Magic value used in comparison)

radish/__init__.py

@@ -8,9 +8,9 @@
 __BUGTRACK_URL__ = "https://github.com/radish-bdd/radish/issues"
 
 # export some functions for users
-from .terrain import world, pick
-from .hookregistry import before, after
-from .stepregistry import step, given, when, then, steps
-from .customtyperegistry import custom_type, register_custom_type, TypeBuilder
-from .extensionregistry import extension
+from .customtyperegistry import TypeBuilder, custom_type, register_custom_type
 from .exceptions import ValidationError
+from .extensionregistry import extension
+from .hookregistry import after, before
+from .stepregistry import given, step, steps, then, when
+from .terrain import pick, world

radish/core.py

@@ -2,8 +2,8 @@
 Providing radish core functionality.
 """
 
-from threading import Lock
 from collections import OrderedDict
+from threading import Lock
 
 from .parser import FeatureParser
 

radish/customtyperegistry.py

@@ -2,10 +2,9 @@
 This module provides the Argument-Expression Registry
 """
 
-from singleton import singleton
-
 # Keep for backwards compat:
 from parse_type import TypeBuilder  # noqa: F401
+from singleton import singleton
 
 from .exceptions import RadishError
 

radish/errororacle.py

@@ -8,12 +8,11 @@
 import colorful
 
 from .exceptions import (
-    RadishError,
     HookError,
+    RadishError,
 )
 from .utils import Failure, console_write
 
-
 __RADISH_DOC__ = "https://github.com/radish-bdd/radish"
 
 

radish/exceptions.py

@@ -1,6 +1,5 @@
 from .terrain import world
 
-
 __DOCS__ = "https://github.com/radish-bdd/radish"
 
 

radish/extensions/bdd_xml_writer.py

@@ -2,20 +2,20 @@
 This module provides a hook which generates a BDD XML result file at the end of the run.
 """
 
-from os import getlogin
+import re
+from datetime import timedelta
 from getpass import getuser
+from os import getlogin
 from socket import gethostname
-from datetime import timedelta
-import re
 
-from radish.terrain import world
-from radish.hookregistry import after
+import radish.utils as utils
 from radish.exceptions import RadishError
-from radish.scenariooutline import ScenarioOutline
+from radish.extensionregistry import extension
+from radish.hookregistry import after
 from radish.scenarioloop import ScenarioLoop
+from radish.scenariooutline import ScenarioOutline
 from radish.stepmodel import Step
-from radish.extensionregistry import extension
-import radish.utils as utils
+from radish.terrain import world
 
 
 @extension

radish/extensions/codecoverage.py

@@ -3,15 +3,14 @@
 coverage measurements.
 """
 
-import sys
 import re
-
+import sys
 from io import StringIO
 
+from radish.exceptions import RadishError
 from radish.extensionregistry import extension
-from radish.hookregistry import before, after
+from radish.hookregistry import after, before
 from radish.terrain import world
-from radish.exceptions import RadishError
 
 
 @extension

radish/extensions/cucumber_json_writer.py

@@ -2,16 +2,16 @@
 This module provides a hook which generates a cucumber json result file at the end of the run.
 """
 
-from datetime import timedelta, datetime, timezone
 import json
+from datetime import datetime, timedelta, timezone
 
-from radish.terrain import world
-from radish.hookregistry import after
 from radish.exceptions import RadishError
-from radish.scenariooutline import ScenarioOutline
+from radish.extensionregistry import extension
+from radish.hookregistry import after
 from radish.scenarioloop import ScenarioLoop
+from radish.scenariooutline import ScenarioOutline
 from radish.stepmodel import Step
-from radish.extensionregistry import extension
+from radish.terrain import world
 
 
 @extension

radish/extensions/endreport_writer.py

@@ -7,14 +7,15 @@
 import colorful
 import humanize
 
+from radish.extensionregistry import extension
 from radish.hookregistry import after
-from radish.stepmodel import Step
-from radish.utils import console_write as write, make_unique_obj_list, get_func_code
-from radish.scenariooutline import ScenarioOutline
 from radish.scenarioloop import ScenarioLoop
-from radish.extensionregistry import extension
-from radish.terrain import world
+from radish.scenariooutline import ScenarioOutline
+from radish.stepmodel import Step
 from radish.stepregistry import StepRegistry
+from radish.terrain import world
+from radish.utils import console_write as write
+from radish.utils import get_func_code, make_unique_obj_list
 
 
 @extension

radish/extensions/failure_debugger.py

@@ -2,10 +2,10 @@
 This module provides an extension which starts a debugger when a step fails
 """
 
+import radish.utils as utils
+from radish.extensionregistry import extension
 from radish.hookregistry import after
 from radish.stepmodel import Step
-from radish.extensionregistry import extension
-import radish.utils as utils
 
 
 @extension

radish/extensions/failure_inspector.py

@@ -2,10 +2,10 @@
 This module provides an extension which starts a python shell after a step failed
 """
 
-from radish.hookregistry import after
-from radish.stepmodel import Step
 from radish.exceptions import RadishError
 from radish.extensionregistry import extension
+from radish.hookregistry import after
+from radish.stepmodel import Step
 
 
 @extension

radish/extensions/formatters/dots.py

@@ -3,14 +3,15 @@
 """
 
 import sys
+
 import colorful as cf
 
-from radish.terrain import world
-from radish.hookregistry import before, after
-from radish.scenariooutline import ScenarioOutline
+from radish.extensionregistry import extension
+from radish.hookregistry import after, before
 from radish.scenarioloop import ScenarioLoop
+from radish.scenariooutline import ScenarioOutline
 from radish.stepmodel import Step
-from radish.extensionregistry import extension
+from radish.terrain import world
 
 
 @extension

radish/extensions/formatters/gherkin.py

@@ -4,15 +4,16 @@
 
 import os
 import re
+
 import colorful
 
-from radish.terrain import world
-from radish.hookregistry import before, after
+from radish.extensionregistry import extension
 from radish.feature import Feature
-from radish.scenariooutline import ScenarioOutline
+from radish.hookregistry import after, before
 from radish.scenarioloop import ScenarioLoop
+from radish.scenariooutline import ScenarioOutline
 from radish.stepmodel import Step
-from radish.extensionregistry import extension
+from radish.terrain import world
 from radish.utils import console_write as write
 
 

radish/extensions/junit_xml_writer.py

@@ -2,17 +2,17 @@
 This module provides a hook which generates a JUnit XML result file at the end of the run.
 """
 
-from datetime import timedelta
 import re
+from datetime import timedelta
 
-from radish.terrain import world
-from radish.hookregistry import after
+import radish.utils as utils
 from radish.exceptions import RadishError
-from radish.scenariooutline import ScenarioOutline
+from radish.extensionregistry import extension
+from radish.hookregistry import after
 from radish.scenarioloop import ScenarioLoop
+from radish.scenariooutline import ScenarioOutline
 from radish.stepmodel import Step
-from radish.extensionregistry import extension
-import radish.utils as utils
+from radish.terrain import world
 
 
 @extension

radish/extensions/syslog_writer.py

@@ -5,10 +5,10 @@
 import os
 import sys
 
-from radish.terrain import world
-from radish.feature import Feature
-from radish.hookregistry import before, after
 from radish.extensionregistry import extension
+from radish.feature import Feature
+from radish.hookregistry import after, before
+from radish.terrain import world
 
 
 @extension

radish/extensions/time_recorder.py

@@ -4,8 +4,8 @@
 
 from datetime import datetime, timezone
 
-from radish.hookregistry import after, before
 from radish.extensionregistry import extension
+from radish.hookregistry import after, before
 
 __REQUIRED__ = True
 

radish/extensions/user_data.py

@@ -6,9 +6,9 @@
 
 import re
 
-from radish.terrain import world
 from radish.exceptions import RadishError
 from radish.extensionregistry import extension
+from radish.terrain import world
 
 
 @extension

radish/feature.py

@@ -3,8 +3,8 @@
 """
 
 from .model import Model
-from .scenariooutline import ScenarioOutline
 from .scenarioloop import ScenarioLoop
+from .scenariooutline import ScenarioOutline
 from .stepmodel import Step
 from .terrain import world
 

radish/hookregistry.py

@@ -2,13 +2,12 @@
 This module provides a registry for all hooks
 """
 
+import tagexpressions
 from singleton import singleton
 
 from . import utils
 from .exceptions import HookError
 
-import tagexpressions
-
 
 @singleton()
 class HookRegistry(object):

radish/loader.py

@@ -2,8 +2,8 @@
 This module contains a class to load the step and terrain files
 """
 
-import os
 import fnmatch
+import os
 
 
 def load_modules(location):

radish/main.py

@@ -3,23 +3,21 @@
 import uuid
 import warnings
 
-from docopt import docopt
 import colorful
 import tagexpressions
+from docopt import docopt
 
-from . import __VERSION__
-from .core import Core
-from .core import Configuration
+from . import __VERSION__, utils
+from .core import Configuration, Core
+from .errororacle import catch_unhandled_exception, error_oracle
+from .exceptions import FeatureFileNotFoundError, ScenarioNotFoundError
+from .extensionregistry import ExtensionRegistry
+from .hookregistry import HookRegistry
 from .loader import load_modules
 from .matcher import merge_steps
-from .stepregistry import StepRegistry
-from .hookregistry import HookRegistry
 from .runner import Runner
-from .extensionregistry import ExtensionRegistry
-from .exceptions import FeatureFileNotFoundError, ScenarioNotFoundError
-from .errororacle import error_oracle, catch_unhandled_exception
+from .stepregistry import StepRegistry
 from .terrain import world
-from . import utils
 
 # use only 8 ANSI colors
 # FIXME(TF): change to true colors!

radish/parser.py

@@ -3,23 +3,23 @@
 One Feature file parser instance is able to parse one feature file.
 """
 
-import os
+import copy
+import filecmp
 import io
-import re
 import json
-import filecmp
-import copy
+import os
+import re
 import string
 
-from .exceptions import RadishError, FeatureFileSyntaxError, LanguageNotSupportedError
+from . import utils
+from .background import Background
+from .exceptions import FeatureFileSyntaxError, LanguageNotSupportedError, RadishError
 from .feature import Feature
+from .model import Tag
 from .scenario import Scenario
-from .scenariooutline import ScenarioOutline
 from .scenarioloop import ScenarioLoop
+from .scenariooutline import ScenarioOutline
 from .stepmodel import Step
-from .background import Background
-from .model import Tag
-from . import utils
 
 
 class Keywords(object):

radish/runner.py

@@ -4,10 +4,10 @@
 
 from random import shuffle
 
-from .terrain import world
-from .scenariooutline import ScenarioOutline
 from .scenarioloop import ScenarioLoop
+from .scenariooutline import ScenarioOutline
 from .stepmodel import Step
+from .terrain import world
 
 
 class Runner(object):