Add six as dependency. Support older six-es as well.

Author: Bogdan Hodorog

CHANGELOG.md

@@ -1,5 +1,9 @@
 This project uses [Semantic Versioning][] and follows [these][keepachangelog] changelog guidelines.
 
+# v0.4.7 - 2019-06-28
+#### Fixed:
+  - ensure six is a newer version
+
 # v0.4.6 - 2019-06-27
 #### Fixed:
 
@@ -12,7 +16,7 @@ This project uses [Semantic Versioning][] and follows [these][keepachangelog] ch
       - should fix using `requests.post(url, json=dict(...))`
 
 # v0.4.5 - 2018-06-18
-####Fixed:
+#### Fixed:
   - custom wrappers now work properly in playback mode
 
 # v0.4.4 - 2018-05-15

Makefile

@@ -8,11 +8,13 @@ pypi-sdist-wheel: test pypi-sdist-clean
 	python setup.py egg_info sdist
 	tox -e wheel
 
-pypi-upload: pypi-sdist-wheel
+pypi-upload:
 	$(eval TAG := "v"$(shell python setup.py --version))
 	tox -e twine -- upload --username bhodorog dist/*
 	git -c 'user.name=Bogdan Hodorog' -c '[email protected]' tag -a -m "Manually built using make" $(TAG)
 	git push origin $(TAG)
 
-.PHONY: test
+release: pypi-sdist-wheel pypi-upload
+
+.PHONY: test release
 .PHONY: pypi-sdist-clean pypi-sdist pypi-upload

setup.py

@@ -13,7 +13,7 @@
     version=__version__,  # noqa
     packages=find_packages("src"),
     package_dir={"": "src"},
-    install_requires=["pytest >=2.3", "responses", "cookies"],
+    install_requires=["pytest >=2.3", "responses", "cookies", "six"],
     entry_points={
         "pytest11": [
             "pytest_vts = pytest_vts"

src/pytest_vts/logic/machine.py

@@ -23,10 +23,32 @@ class RequestBodyDoesntMatchTrack(Exception):
     pass
 
 
-def ensure_text_silent(s, *args, **kwargs):
-    if s is None:
-        return s
-    return six.ensure_text(s, *args, **kwargs)
+def ensure_text_silent(ss, *args, **kwargs):
+    if ss is None:
+        return ss
+    if hasattr(six, "ensure_text"):
+        _ensure_text = six.ensure_text
+    else:
+        def _ensure_text(s, encoding='utf-8', errors='strict'):
+            """Coerce *s* to six.text_type.
+            For Python 2:
+              - `unicode` -> `unicode`
+              - `str` -> `unicode`
+            For Python 3:
+              - `str` -> `str`
+              - `bytes` -> decoded to `str`
+
+            "Stolen" from six >1.12.0 to avoid having a hard dependency on that,
+            but rather allow clients to use any version of six
+            """
+            if isinstance(s, six.binary_type):
+                return s.decode(encoding, errors)
+            elif isinstance(s, six.text_type):
+                return s
+            else:
+                raise TypeError("not expecting type '%s'" % type(s))
+    return _ensure_text(ss, *args, **kwargs)
+
 
 def function_name(pytest_req):
     return pytest_req.node.name