Merge pull request #4248 from jdufresne/binary-type

Remove use of unnecessary compat shim, six.binary_type
pytest-dev · Oct 26, 2018 · 1d09e1d · 1d09e1d
2 parents d59786f + af34164
commit 1d09e1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog/4248.trivial.rst b/changelog/4248.trivial.rst
@@ -0,0 +1 @@
+Remove use of unnecessary compat shim, six.binary_type
diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py
@@ -159,7 +159,7 @@ def create_cleanup_lock(p):
     else:
         pid = os.getpid()
         spid = str(pid)
-        if not isinstance(spid, six.binary_type):
+        if not isinstance(spid, bytes):
             spid = spid.encode("ascii")
         os.write(fd, spid)
         os.close(fd)