Merge pull request #480 from radish-bdd/reduce-compat

Reduce compat

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # radish documentation build configuration file, created by
 # sphinx-quickstart on Sat Jun 13 21:58:55 2015.
 #

docs/quickstart.rst

@@ -44,8 +44,6 @@ Let's write our first feature file called *radish/steps.py*:
 
 .. code:: python
 
-   # -*- coding: utf-8 -*-
-
    from radish import given, when, then
 
    @given("I have the numbers {number1:g} and {number2:g}")
@@ -73,8 +71,6 @@ For our *calculator* tests we use the *radish/terrain.py* file to instantiate th
 
 .. code:: python
 
-   # -*- coding: utf-8 -*-
-
    from radish import before, after
 
    from calculator import Calculator

radish/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 __DESCRIPTION__ = "Behaviour-Driven-Development tool for Python"
 __LICENSE__ = "MIT"
 __VERSION__ = "0.17.1"

radish/background.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a representation of a Feature Background.
 """

radish/core.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Providing radish core functionality.
 """

radish/customtyperegistry.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides the Argument-Expression Registry
 """

radish/errororacle.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides some functionality to diagnose thrown exceptions
 """

radish/examplescenario.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a class to represent one Scenario Outline Example
 """

radish/exceptions.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from .terrain import world
 
 

radish/extensionregistry.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Provide plugin interface for radish extensions
 """

radish/extensions/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

radish/extensions/bdd_xml_writer.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a hook which generates a BDD XML result file at the end of the run.
 """

radish/extensions/codecoverage.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a radish extension to make
 coverage measurements.

radish/extensions/cucumber_json_writer.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a hook which generates a cucumber json result file at the end of the run.
 """

radish/extensions/endreport_writer.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This radish extension module provide the functionality to write the end report
 """

radish/extensions/failure_debugger.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides an extension which starts a debugger when a step fails
 """

radish/extensions/failure_inspector.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides an extension which starts a python shell after a step failed
 """

radish/extensions/formatters/dots.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This radish extension provides the functionality to write the feature file run to the console.
 """

radish/extensions/formatters/gherkin.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This radish extension provides the functionality to write the feature file run to the console.
 """

radish/extensions/junit_xml_writer.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a hook which generates a JUnit XML result file at the end of the run.
 """

radish/extensions/syslog_writer.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides an extension to write all features, scenarios and steps to the syslog.
 """

radish/extensions/time_recorder.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module is a REQUIRED extension to record the time of Features, Scenarios and Steps
 """

radish/extensions/user_data.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a hook which processes user specified data on the command-line
 and provides this data as a dictionary attached to the world.config object
 as per Enhancement #124.
 """
+
 import re
 
 from radish.terrain import world

radish/feature.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a class to represent a Feature from a parsed feature file.
 """

radish/hookregistry.py

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-
 """
-    This module provides a registry for all hooks
+This module provides a registry for all hooks
 """
 
 from singleton import singleton
@@ -127,8 +125,8 @@ def call(self, when, what, ascending, model, *args, **kwargs):
         """
         for _, on_tags, func in sorted(self._hooks[what][when], key=lambda h: h[0], reverse=not ascending):
             if not self.__has_to_run(model, on_tags):
-                # # this hook does not have to run because
-                # # it was excluded due to the tags for this model
+                # this hook does not have to run because
+                # it was excluded due to the tags for this model
                 continue
 
             try:

radish/iterationscenario.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a Scenario which represents one iteration in a ScenarioLoop
 """

radish/loader.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module contains a class to load the step and terrain files
 """

radish/main.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os
 import sys
 import uuid

radish/matcher.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a class to match the feature file steps with the registered steps from the registry
 """
@@ -11,7 +9,6 @@
 
 from .customtyperegistry import CustomTypeRegistry
 from .exceptions import StepDefinitionNotFoundError, StepPatternError
-from .compat import re_pattern
 
 StepMatch = namedtuple("StepMatch", ["argument_match", "func"])
 
@@ -89,7 +86,7 @@ def match_step(sentence, steps):
     """
     potentional_matches = []
     for pattern, func in steps.items():
-        if isinstance(pattern, re_pattern):  # pylint: disable=protected-access
+        if isinstance(pattern, re.Pattern):  # pylint: disable=protected-access
             match = pattern.search(sentence)
             argument_match = RegexStepArguments(match)
             if match:

radish/model.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This model provides a base class for all models:
 

radish/parser.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Feature file parser.
 One Feature file parser instance is able to parse one feature file.
@@ -13,7 +11,6 @@
 import copy
 import string
 
-from .compat import RecursionError
 from .exceptions import RadishError, FeatureFileSyntaxError, LanguageNotSupportedError
 from .feature import Feature
 from .scenario import Scenario
@@ -519,7 +516,7 @@ def _parse_precondition(self, arguments):
             try:
                 current_tags = self._current_tags + self.feature.tags + self._inherited_tags
                 feature = self._core.parse_feature(feature_file, self._tag_expr, inherited_tags=current_tags)
-            except (RuntimeError, RecursionError) as e:
+            except RecursionError as e:
                 if str(e).startswith("maximum recursion depth exceeded"):  # precondition cycling
                     raise FeatureFileSyntaxError(
                         "Your feature '{0}' has cycling preconditions with '{1}: {2}' starting at line {3}".format(

radish/runner.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Providing radish core functionality like the feature file Runner.
 """

radish/scenario.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a class to represent a Scenario
 """

radish/scenarioloop.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a Scenario type which represents a Scenario loop
 """

radish/scenariooutline.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a class to represent a Scenario Outline
 """

radish/stepmodel.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a class to represent a Step
 """

radish/stepregistry.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a registry for all custom steps which were decorated with the @step-decorator.
 """
@@ -9,7 +7,6 @@
 from singleton import singleton
 
 from .exceptions import RadishError, SameStepError, StepRegexError
-from .compat import re_pattern
 
 
 @singleton()
@@ -141,7 +138,7 @@ def given(pattern):
     """
     Step decorator prefixed with the Given-keyword.
     """
-    if isinstance(pattern, re_pattern):  # pylint: disable=protected-access
+    if isinstance(pattern, re.Pattern):  # pylint: disable=protected-access
         return step(re.compile(r"Given {0}".format(pattern.pattern)))
     return step("Given {0}".format(pattern))
 
@@ -150,7 +147,7 @@ def when(pattern):
     """
     Step decorator prefixed with the When-keyword.
     """
-    if isinstance(pattern, re_pattern):  # pylint: disable=protected-access
+    if isinstance(pattern, re.Pattern):  # pylint: disable=protected-access
         return step(re.compile(r"When {0}".format(pattern.pattern)))
     return step("When {0}".format(pattern))
 
@@ -159,6 +156,6 @@ def then(pattern):
     """
     Step decorator prefixed with the Then-keyword.
     """
-    if isinstance(pattern, re_pattern):  # pylint: disable=protected-access
+    if isinstance(pattern, re.Pattern):  # pylint: disable=protected-access
         return step(re.compile(r"Then {0}".format(pattern.pattern)))
     return step("Then {0}".format(pattern))

radish/terrain.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Terrain module providing step overlapping data containers
 """

radish/testing/__main__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides a script to test the
 radish step implementations

radish/testing/matches.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides functionaliy to test
 if some sentences are matched with the expected

radish/utils.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 This module provides several utility functions
 """

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # pylint: disable=missing-docstring
 
 import os

tests/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

tests/conftest.py

@@ -1,12 +1,10 @@
-# -*- coding: utf-8 -*-
-
 """
-    radish
-    ~~~~~~
+radish
+~~~~~~
 
-    Behavior Driven Development tool for Python - the root from red to green
+Behavior Driven Development tool for Python - the root from red to green
 
-    Copyright: MIT, Timo Furrer <[email protected]>
+Copyright: MIT, Timo Furrer <[email protected]>
 """
 
 import os

tests/data/radish/steps.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import re
 from radish.terrain import world
 from radish.stepregistry import step

tests/data/radish/terrain.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 from radish import before