aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-07-05 15:00:26 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-07-05 15:00:26 -0400
commit508f0f5134f3f5e87f53b7773086c8ecb30c527e (patch)
treec88ecb259ef29450e9a8fdbe18cdc196540326e5
parentc4ecbd1e58a3384a5ab730450fa5487e48b68721 (diff)
downloadexternal_python_setuptools-508f0f5134f3f5e87f53b7773086c8ecb30c527e.tar.gz
external_python_setuptools-508f0f5134f3f5e87f53b7773086c8ecb30c527e.tar.bz2
external_python_setuptools-508f0f5134f3f5e87f53b7773086c8ecb30c527e.zip
next compatibility is no longer required
-rw-r--r--setuptools/command/bdist_egg.py2
-rw-r--r--setuptools/compat.py2
-rw-r--r--setuptools/tests/test_easy_install.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 831d6042..34fdeec2 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -14,7 +14,7 @@ import textwrap
from pkg_resources import get_build_platform, Distribution, ensure_directory
from pkg_resources import EntryPoint
-from setuptools.compat import basestring, next
+from setuptools.compat import basestring
from setuptools.extension import Library
from setuptools import Command
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 45c2f24c..73e6e4aa 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -21,7 +21,6 @@ if PY2:
iteritems = lambda o: o.iteritems()
long_type = long
maxsize = sys.maxint
- next = lambda o: o.next()
unichr = unichr
unicode = unicode
bytes = str
@@ -49,7 +48,6 @@ if PY3:
iteritems = lambda o: o.items()
long_type = int
maxsize = sys.maxsize
- next = next
unichr = chr
unicode = str
bytes = bytes
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 31802aa2..a4430953 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -12,7 +12,7 @@ import tarfile
import logging
import distutils.core
-from setuptools.compat import StringIO, BytesIO, next, urlparse
+from setuptools.compat import StringIO, BytesIO, urlparse
from setuptools.sandbox import run_setup, SandboxViolation
from setuptools.command.easy_install import (
easy_install, fix_jython_executable, get_script_args, nt_quote_arg)