aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/install_egg_info.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-03-29 23:15:27 -0400
committerJason R. Coombs <jaraco@jaraco.com>2012-03-29 23:15:27 -0400
commitd6d8bcaf4e80dae0f8ba9f81ba1db4b05b857909 (patch)
tree2292042ee7e74f0f09171f058e751f0cbe792841 /setuptools/command/install_egg_info.py
parent0d6b0fdd59f5fb29c06ed335fc7597951c5f277f (diff)
parentdf1e3725c0ef744f89e1769767e04b78ebc9a525 (diff)
downloadexternal_python_setuptools-d6d8bcaf4e80dae0f8ba9f81ba1db4b05b857909.tar.gz
external_python_setuptools-d6d8bcaf4e80dae0f8ba9f81ba1db4b05b857909.tar.bz2
external_python_setuptools-d6d8bcaf4e80dae0f8ba9f81ba1db4b05b857909.zip
Merge with default
--HG-- branch : distribute extra : rebase_source : a19a5411e30665acdd86f2554921e385759b1ef3
Diffstat (limited to 'setuptools/command/install_egg_info.py')
-rwxr-xr-xsetuptools/command/install_egg_info.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index dd95552e..f44b34b5 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -89,6 +89,8 @@ class install_egg_info(Command):
if not self.dry_run:
f = open(filename,'wt')
for pkg in nsp:
+ # ensure pkg is not a unicode string under Python 2.7
+ pkg = str(pkg)
pth = tuple(pkg.split('.'))
trailer = '\n'
if '.' in pkg: