summaryrefslogtreecommitdiff
path: root/setuptools/command/bdist_egg.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-07-05 15:06:51 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-07-05 15:06:51 -0400
commitb49435397a5094f94678adf3549cc8941aa469b7 (patch)
treeb123bdd63482393ba1e2859364920f40a3d9f71d /setuptools/command/bdist_egg.py
parent5b865b1b6e23379d23aa80e74adb38db8b14b6ca (diff)
downloadpython-setuptools-git-b49435397a5094f94678adf3549cc8941aa469b7.tar.gz
Use six for Python 2 compatibility
--HG-- branch : feature/issue-229 extra : source : 7b1997ececc5772798ce33a0f8e77387cb55a977
Diffstat (limited to 'setuptools/command/bdist_egg.py')
-rw-r--r--setuptools/command/bdist_egg.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 34fdeec2..3d241b99 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -12,9 +12,10 @@ import os
import marshal
import textwrap
+import six
+
from pkg_resources import get_build_platform, Distribution, ensure_directory
from pkg_resources import EntryPoint
-from setuptools.compat import basestring
from setuptools.extension import Library
from setuptools import Command
@@ -418,7 +419,7 @@ def iter_symbols(code):
for name in code.co_names:
yield name
for const in code.co_consts:
- if isinstance(const, basestring):
+ if isinstance(const, six.string_types):
yield const
elif isinstance(const, CodeType):
for name in iter_symbols(const):