Merge pull request #406 from elchupanebrej/actual_python_pytest

- Drop support of python 2.7, 3.5; Add explicit support for python >=3.6
- Remove six dependency

Co-authored-by: Konstantin Goloveshko <[email protected]>

Author: youtux

.travis.yml

@@ -1,11 +1,10 @@
 dist: bionic
 language: python
 python:
-- '2.7'
-- '3.5'
 - '3.6'
 - '3.7'
 - '3.8'
+- '3.9'
 install: pip install tox tox-travis coverage codecov
 script: tox --recreate
 branches:

CHANGES.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+Unreleased
+-----------
+- Drop compatibility for python 2 and officially support only python >= 3.6.
+
 4.0.2
 -----
 - Fix a bug that prevents using comments in the ``Examples:`` section. (youtux)

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Pytest-BDD documentation build configuration file, created by
 # sphinx-quickstart on Sun Apr  7 21:07:56 2013.
@@ -15,7 +14,8 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
-import sys, os
+import os
+import sys
 
 sys.path.insert(0, os.path.abspath(".."))
 
@@ -43,8 +43,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Pytest-BDD"
-copyright = u"2013, Oleg Pidsadnyi"
+project = "Pytest-BDD"
+copyright = "2013, Oleg Pidsadnyi"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -183,7 +183,7 @@
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [("index", "Pytest-BDD.tex", u"Pytest-BDD Documentation", u"Oleg Pidsadnyi", "manual")]
+latex_documents = [("index", "Pytest-BDD.tex", "Pytest-BDD Documentation", "Oleg Pidsadnyi", "manual")]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
@@ -210,7 +210,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "pytest-bdd", u"Pytest-BDD Documentation", [u"Oleg Pidsadnyi"], 1)]
+man_pages = [("index", "pytest-bdd", "Pytest-BDD Documentation", ["Oleg Pidsadnyi"], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -225,8 +225,8 @@
     (
         "index",
         "Pytest-BDD",
-        u"Pytest-BDD Documentation",
-        u"Oleg Pidsadnyi",
+        "Pytest-BDD Documentation",
+        "Oleg Pidsadnyi",
         "Pytest-BDD",
         "One line description of project.",
         "Miscellaneous",

pyproject.toml

@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 120
-target-version = ['py27', 'py35', 'py36', 'py37', 'py38']
+target-version = ['py36', 'py37', 'py38']

pytest_bdd/cucumber_json.py

@@ -1,14 +1,10 @@
 """Cucumber json output formatter."""
 
-import codecs
 import json
 import math
 import os
-import sys
 import time
 
-from .feature import force_unicode
-
 
 def add_options(parser):
     """Add pytest-bdd options."""
@@ -72,7 +68,7 @@ def _get_result(self, step, report, error_message=False):
         if report.passed or not step["failed"]:  # ignore setup/teardown
             result = {"status": "passed"}
         elif report.failed and step["failed"]:
-            result = {"status": "failed", "error_message": force_unicode(report.longrepr) if error_message else ""}
+            result = {"status": "failed", "error_message": str(report.longrepr) if error_message else ""}
         elif report.skipped:
             result = {"status": "skipped"}
         result["duration"] = int(math.floor((10 ** 9) * step["duration"]))  # nanosec
@@ -171,11 +167,7 @@ def pytest_sessionstart(self):
         self.suite_start_time = time.time()
 
     def pytest_sessionfinish(self):
-        if sys.version_info[0] < 3:
-            logfile_open = codecs.open
-        else:
-            logfile_open = open
-        with logfile_open(self.logfile, "w", encoding="utf-8") as logfile:
+        with open(self.logfile, "w", encoding="utf-8") as logfile:
             logfile.write(json.dumps(list(self.features.values())))
 
     def pytest_terminal_summary(self, terminalreporter):

pytest_bdd/exceptions.py

@@ -1,5 +1,4 @@
 """pytest-bdd Exceptions."""
-import six
 
 
 class ScenarioIsDecoratorOnly(Exception):
@@ -30,19 +29,14 @@ class StepDefinitionNotFoundError(Exception):
     """Step definition not found."""
 
 
-class InvalidStepParserError(Exception):
-    """Invalid step parser."""
-
-
 class NoScenariosFound(Exception):
     """No scenarios found."""
 
 
-@six.python_2_unicode_compatible
 class FeatureError(Exception):
     """Feature parse error."""
 
-    message = u"{0}.\nLine number: {1}.\nLine: {2}.\nFile: {3}"
+    message = "{0}.\nLine number: {1}.\nLine: {2}.\nFile: {3}"
 
     def __str__(self):
         """String representation."""

pytest_bdd/feature.py

@@ -24,47 +24,15 @@
 one line.
 """
 import os.path
-import sys
 
 import glob2
 
 from .parser import parse_feature
 
-
 # Global features dictionary
 features = {}
 
 
-def force_unicode(obj, encoding="utf-8"):
-    """Get the unicode string out of given object (python 2 and python 3).
-
-    :param obj: An `object`, usually a string.
-
-    :return: unicode string.
-    """
-    if sys.version_info < (3, 0):
-        if isinstance(obj, str):
-            return obj.decode(encoding)
-        else:
-            return unicode(obj)
-    else:  # pragma: no cover
-        return str(obj)
-
-
-def force_encode(string, encoding="utf-8"):
-    """Force string encoding (Python compatibility function).
-
-    :param str string: A string value.
-    :param str encoding: Encoding.
-
-    :return: Encoded string.
-    """
-    if sys.version_info < (3, 0):
-        if isinstance(string, unicode):
-            string = string.encode(encoding)
-    return string
-
-
 def get_feature(base_path, filename, encoding="utf-8"):
     """Get a feature by the filename.
 

pytest_bdd/generation.py

@@ -3,15 +3,14 @@
 import itertools
 import os.path
 
-from mako.lookup import TemplateLookup
 import py
+from mako.lookup import TemplateLookup
 
+from .feature import get_features
 from .scenario import find_argumented_step_fixture_name, make_python_docstring, make_python_name, make_string_literal
 from .steps import get_step_fixture_name
-from .feature import get_features
 from .types import STEP_TYPES
 
-
 template_lookup = TemplateLookup(directories=[os.path.join(os.path.dirname(__file__), "templates")])
 
 
@@ -109,19 +108,19 @@ def print_missing_code(scenarios, steps):
     tw.write(code)
 
 
-def _find_step_fixturedef(fixturemanager, item, name, type_, encoding="utf-8"):
+def _find_step_fixturedef(fixturemanager, item, name, type_):
     """Find step fixturedef.
 
     :param request: PyTest Item object.
     :param step: `Step`.
 
     :return: Step function.
     """
-    fixturedefs = fixturemanager.getfixturedefs(get_step_fixture_name(name, type_, encoding), item.nodeid)
+    fixturedefs = fixturemanager.getfixturedefs(get_step_fixture_name(name, type_), item.nodeid)
     if not fixturedefs:
         name = find_argumented_step_fixture_name(name, type_, fixturemanager)
         if name:
-            return _find_step_fixturedef(fixturemanager, item, name, encoding)
+            return _find_step_fixturedef(fixturemanager, item, name, type_)
     else:
         return fixturedefs
 

pytest_bdd/gherkin_terminal_reporter.py

@@ -1,7 +1,3 @@
-# -*- encoding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import re
 
 from _pytest.terminal import TerminalReporter

pytest_bdd/parser.py

@@ -4,8 +4,6 @@
 import textwrap
 from collections import OrderedDict
 
-import six
-
 from . import types, exceptions
 
 SPLIT_LINE_RE = re.compile(r"(?<!\\)\|")
@@ -193,7 +191,7 @@ def parse_feature(basedir, filename, encoding="utf-8"):
             target.add_step(step)
         prev_line = clean_line
 
-    feature.description = u"\n".join(description).strip()
+    feature.description = "\n".join(description).strip()
     return feature
 
 
@@ -292,7 +290,6 @@ def validate(self):
             )
 
 
-@six.python_2_unicode_compatible
 class Step(object):
 
     """Step."""
@@ -447,9 +444,6 @@ def __bool__(self):
         """Bool comparison."""
         return bool(self.vertical_examples or self.examples)
 
-    if six.PY2:
-        __nonzero__ = __bool__
-
 
 def get_tags(line):
     """Get tags out of the given line.