aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-06-14 08:58:06 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-06-14 08:58:06 -0400
commit16666484c9f5f8e3707ccc810ee1504aad47eb7a (patch)
treee30906be54bc2569231889615c517b76af18dc81
parent0d688c047fa27b52bc71fb1dc24b30ef8814e1cc (diff)
parent18c255d1e1a83d45a055cfcc0fa3140c775afc0d (diff)
downloadexternal_python_setuptools-16666484c9f5f8e3707ccc810ee1504aad47eb7a.tar.gz
external_python_setuptools-16666484c9f5f8e3707ccc810ee1504aad47eb7a.tar.bz2
external_python_setuptools-16666484c9f5f8e3707ccc810ee1504aad47eb7a.zip
Merge with 3.7.1 (Ref #213)
-rwxr-xr-xsetuptools/command/egg_info.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9019524d..04ed6357 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -5,13 +5,12 @@ Create a distribution's .egg-info directory and contents"""
import os
import re
import sys
-import io
from setuptools import Command
import distutils.errors
from distutils import log
from setuptools.command.sdist import sdist
-from setuptools.compat import basestring, PY3, unicode
+from setuptools.compat import basestring, PY3, StringIO
from setuptools import svn_utils
from distutils.util import convert_path
from distutils.filelist import FileList as _FileList
@@ -364,7 +363,7 @@ def _write_requirements(stream, reqs):
def write_requirements(cmd, basename, filename):
dist = cmd.distribution
- data = io.StringIO() if PY3 else io.BytesIO()
+ data = StringIO()
_write_requirements(data, dist.install_requires)
extras_require = dist.extras_require or {}
for extra in sorted(extras_require):