Run pyupgrade to migrate away from Python 2 code

Author: fliiiix

radish/background.py

@@ -12,7 +12,7 @@ class Background(Scenario):
     """
 
     def __init__(self, keyword, sentence, path, line, parent):
-        super(Background, self).__init__(None, keyword, sentence, path, line, parent)
+        super().__init__(None, keyword, sentence, path, line, parent)
 
     def create_instance(self, parent=None, steps_runable=False):
         """

radish/core.py

@@ -8,7 +8,7 @@
 from .parser import FeatureParser
 
 
-class Configuration(object):
+class Configuration:
     """
     Manage configuration. Attributes of the class are created from the
     names of the command line options and are set to the command line
@@ -33,7 +33,7 @@ def __init__(self, arguments):
 
 
 # FIXME: rename
-class Core(object):
+class Core:
     """
     Provide some core functionalities like parsing and storing of the feature files
     """

radish/customtyperegistry.py

@@ -10,7 +10,7 @@
 
 
 @singleton()
-class CustomTypeRegistry(object):
+class CustomTypeRegistry:
     """
     Registry for all custom argument expressions
     """
@@ -23,7 +23,7 @@ def register(self, name, func):
         Registers a custom type
         """
         if name in self.custom_types:
-            raise RadishError("Cannot register custom type with name {0} because it already exists".format(name))
+            raise RadishError("Cannot register custom type with name {} because it already exists".format(name))
 
         self.custom_types[name] = func
 

radish/errororacle.py

@@ -20,14 +20,14 @@ def write_error(text):
     """
     Writes the given text to the console
     """
-    console_write("{0}: {1}".format(colorful.bold_red("Error"), colorful.red(text)))
+    console_write("{}: {}".format(colorful.bold_red("Error"), colorful.red(text)))
 
 
 def write_failure(failure):
     """
     Writes the failure to the console
     """
-    console_write("\n{0}".format(colorful.red(failure.traceback)))
+    console_write("\n{}".format(colorful.red(failure.traceback)))
 
 
 def abort(return_code):

radish/examplescenario.py

@@ -11,7 +11,7 @@ class ExampleScenario(Scenario):
     """
 
     def __init__(self, id, keyword, sentence, path, line, parent, example, background=None):
-        super(ExampleScenario, self).__init__(
+        super().__init__(
             id, keyword, sentence, path, line, parent, parent.tags, background=background
         )
         self.example = example

radish/exceptions.py

@@ -18,7 +18,7 @@ class LanguageNotSupportedError(RadishError):
 
     def __init__(self, language):
         self.language = language
-        super(LanguageNotSupportedError, self).__init__("Language {0} could not be found".format(language))
+        super().__init__("Language {} could not be found".format(language))
 
 
 class FeatureFileNotFoundError(RadishError):
@@ -28,7 +28,7 @@ class FeatureFileNotFoundError(RadishError):
 
     def __init__(self, featurefile):
         self.featurefile = featurefile
-        super(FeatureFileNotFoundError, self).__init__("Feature file '{0}': No such file".format(featurefile))
+        super().__init__("Feature file '{}': No such file".format(featurefile))
 
 
 class FeatureFileSyntaxError(RadishError, SyntaxError):
@@ -45,7 +45,7 @@ class FeatureFileSyntaxError(RadishError, SyntaxError):
 Link: {docs_link}"""
 
     def __init__(self, msg):
-        super(FeatureFileSyntaxError, self).__init__(
+        super().__init__(
             FeatureFileSyntaxError.MESSAGE_TEMPLATE.format(msg=msg, docs_link=__DOCS__)
         )
 
@@ -59,8 +59,8 @@ def __init__(self, regex, step_func_name, re_error):
         self.regex = regex
         self.step_func_name = step_func_name
         self.re_error = re_error
-        super(StepRegexError, self).__init__(
-            "Cannot compile regex '{0}' from step '{1}': {2}".format(regex, step_func_name, re_error)
+        super().__init__(
+            "Cannot compile regex '{}' from step '{}': {}".format(regex, step_func_name, re_error)
         )
 
 
@@ -73,8 +73,8 @@ def __init__(self, pattern, step_func_name, error):
         self.pattern = pattern
         self.step_func_name = step_func_name
         self.error = error
-        super(StepPatternError, self).__init__(
-            "Cannot compile pattern '{0}' of step '{1}': {2}".format(pattern, step_func_name, error)
+        super().__init__(
+            "Cannot compile pattern '{}' of step '{}': {}".format(pattern, step_func_name, error)
         )
 
 
@@ -95,7 +95,7 @@ def __init__(self, regex, func1, func2):
         self.regex = regex
         self.func1 = func1
         self.func2 = func2
-        super(SameStepError, self).__init__(
+        super().__init__(
             SameStepError.MESSAGE_TEMPLATE.format(func2.__name__, regex, func1.__name__)
         )
 
@@ -118,7 +118,7 @@ def my_step(step):
 
     def __init__(self, step):
         self.step = step
-        super(StepDefinitionNotFoundError, self).__init__(
+        super().__init__(
             StepDefinitionNotFoundError.MESSAGE_TEMPLATE.format(
                 sentence=step.sentence,
                 step_path=step.path,
@@ -144,8 +144,8 @@ class HookError(RadishError):
     def __init__(self, hook_function, failure):
         self.hook_function = hook_function
         self.failure = failure
-        super(HookError, self).__init__(
-            "Hook '{0}' from {1}:{2} raised: '{3}: {4}'".format(
+        super().__init__(
+            "Hook '{}' from {}:{} raised: '{}: {}'".format(
                 hook_function.__name__,
                 hook_function.__code__.co_filename,
                 hook_function.__code__.co_firstlineno,
@@ -163,8 +163,8 @@ class ScenarioNotFoundError(RadishError):
     def __init__(self, scenario_id, amount_of_scenarios):
         self.scenario_id = scenario_id
         self.amount_of_scenarios = amount_of_scenarios
-        super(ScenarioNotFoundError, self).__init__(
-            "No scenario with id {0} found. Specify a scenario id between 1 and {1}".format(
+        super().__init__(
+            "No scenario with id {} found. Specify a scenario id between 1 and {}".format(
                 scenario_id, amount_of_scenarios
             )
         )

radish/extensionregistry.py

@@ -6,7 +6,7 @@
 
 
 @singleton()
-class ExtensionRegistry(object):
+class ExtensionRegistry:
     """
     Registers all extensions
     """
@@ -54,7 +54,7 @@ def get_options(self):
                 options.extend(opt[0] for opt in ext.OPTIONS)
             except AttributeError:
                 pass
-        return "\n           ".join("[{0}]".format(x) for x in options)
+        return "\n           ".join("[{}]".format(x) for x in options)
 
     def get_option_description(self):
         """
@@ -63,7 +63,7 @@ def get_option_description(self):
         options = []
         for ext in self.extensions:
             try:
-                options.extend("{0} {1}".format(opt[0].ljust(43), opt[1]) for opt in ext.OPTIONS)
+                options.extend("{} {}".format(opt[0].ljust(43), opt[1]) for opt in ext.OPTIONS)
             except AttributeError:
                 pass
         return "\n    ".join(options)

radish/extensions/bdd_xml_writer.py

@@ -19,7 +19,7 @@
 
 
 @extension
-class BDDXMLWriter(object):
+class BDDXMLWriter:
     """
     BDD XML Writer radish extension
     """
@@ -96,7 +96,7 @@ def generate_bdd_xml(self, features, marker):
             starttime=utils.format_utc_to_local_tz(features[0].starttime),
             endtime=utils.format_utc_to_local_tz(features[-1].endtime),
             duration=str(duration.total_seconds()),
-            agent="{0}@{1}".format(user, gethostname()),
+            agent="{}@{}".format(user, gethostname()),
         )
 
         for feature in features:
@@ -129,7 +129,7 @@ def generate_bdd_xml(self, features, marker):
                     tag_element = etree.Element("tag")
                     tag_element.text = tag.name
                     if tag.arg:
-                        tag_element.text += "({0})".format(tag.arg)
+                        tag_element.text += "({})".format(tag.arg)
                     scenario_tags_element.append(tag_element)
 
                 for step in scenario.all_steps:

radish/extensions/codecoverage.py

@@ -14,7 +14,7 @@
 
 
 @extension
-class CodeCoverage(object):
+class CodeCoverage:
     """
     Code Coverage radish extension
     """
@@ -118,7 +118,7 @@ def coverage_stop(self, features, marker):
             total_percentage = int(match.groups()[0].split()[-1][:-1])
             if total_percentage < int(world.config.cover_min_percentage):
                 raise RadishError(
-                    "Failed to reach minimum expected coverage of {0}% (reached: {1}%)".format(
+                    "Failed to reach minimum expected coverage of {}% (reached: {}%)".format(
                         world.config.cover_min_percentage, total_percentage
                     )
                 )

radish/extensions/cucumber_json_writer.py

@@ -15,7 +15,7 @@
 
 
 @extension
-class CucumberJSONWriter(object):
+class CucumberJSONWriter:
     """
     cucumber json Writer radish extension
     """