summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2019-08-24 17:34:43 -0700
committerGitHub <noreply@github.com>2019-08-24 17:34:43 -0700
commit0d0e7ddcb04885c80d4151498e2b5e5fd2ca09b5 (patch)
tree2e0bfe06e6dca00beb17aa08f32397d3f26a30dd
parent31b93fa401c989957c64284dac2075e01f07e381 (diff)
downloadtox-git-0d0e7ddcb04885c80d4151498e2b5e5fd2ca09b5.tar.gz
Use `not PY2` instead of `PY3` for python4.x compat (#1404)
-rw-r--r--src/tox/_pytestplugin.py4
-rw-r--r--src/tox/interpreters/py_spec.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tox/_pytestplugin.py b/src/tox/_pytestplugin.py
index 5d34258e..e0381299 100644
--- a/src/tox/_pytestplugin.py
+++ b/src/tox/_pytestplugin.py
@@ -210,7 +210,7 @@ class ReportExpectMock:
def clear(self):
self._index = -1
- if six.PY3:
+ if not six.PY2:
self.instance.reported_lines.clear()
else:
del self.instance.reported_lines[:]
@@ -291,7 +291,7 @@ def create_mocksession(request):
self.report = ReportExpectMock()
def _clearmocks(self):
- if six.PY3:
+ if not six.PY2:
self._pcalls.clear()
else:
del self._pcalls[:]
diff --git a/src/tox/interpreters/py_spec.py b/src/tox/interpreters/py_spec.py
index 04c062e6..2df06672 100644
--- a/src/tox/interpreters/py_spec.py
+++ b/src/tox/interpreters/py_spec.py
@@ -26,7 +26,7 @@ class PythonSpec(object):
def __str__(self):
msg = repr(self)
- return msg if six.PY3 else msg.encode("utf-8")
+ return msg.encode("utf-8") if six.PY2 else msg
def satisfies(self, req):
if req.is_abs and self.is_abs and self.path != req.path: