summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bestwalter <oliver.bestwalter@avira.com>2018-01-27 17:18:53 +0100
committerOliver Bestwalter <oliver.bestwalter@avira.com>2018-01-27 17:18:53 +0100
commit9b6c9a70a7ea42227448a676eae99adeb42d750e (patch)
tree990e962c50ba06c6e86fae05d1cf4824ee2bdf75
parentfee2ab889f41fafbf5fa150453622478b48406d3 (diff)
downloadtox-git-9b6c9a70a7ea42227448a676eae99adeb42d750e.tar.gz
revert change introduced in 6b16b09 (breaks tests in release package)
-rw-r--r--tests/conftest.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 120a44bf..8b36b3b6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1 @@
-from __future__ import unicode_literals
-
-pytest_plugins = ['tox._pytestplugin']
+from tox._pytestplugin import * # noqa