Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap

1 files changed, 4 insertions, 5 deletions

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 792975fd..9854420e 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -1,8 +1,6 @@
 """develop tests
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 import site
 import sys
@@ -10,13 +8,13 @@ import io
 import subprocess
 import platform
 
-from setuptools.extern import six
 from setuptools.command import test
 
 import pytest
 
 from setuptools.command.develop import develop
 from setuptools.dist import Distribution
+from setuptools.tests import ack_2to3
 from . import contexts
 from . import namespaces
 
@@ -65,6 +63,7 @@ class TestDevelop:
     @pytest.mark.skipif(
         in_virtualenv or in_venv,
         reason="Cannot run when invoked in a virtualenv or venv")
+    @ack_2to3
     def test_2to3_user_mode(self, test_env):
         settings = dict(
             name='foo',
@@ -95,7 +94,7 @@ class TestDevelop:
         with io.open(fn) as init_file:
             init = init_file.read().strip()
 
-        expected = 'print "foo"' if six.PY2 else 'print("foo")'
+        expected = 'print("foo")'
         assert init == expected
 
     def test_console_scripts(self, tmpdir):
@@ -161,7 +160,7 @@ class TestNamespaces:
         reason="https://github.com/pypa/setuptools/issues/851",
     )
     @pytest.mark.skipif(
-        platform.python_implementation() == 'PyPy' and not six.PY2,
+        platform.python_implementation() == 'PyPy',
         reason="https://github.com/pypa/setuptools/issues/1202",
     )
     def test_namespace_package_importable(self, tmpdir):