aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-02-06 22:34:53 -0500
committerJason R. Coombs <jaraco@jaraco.com>2012-02-06 22:34:53 -0500
commitd7907a5c969ad05970e458cc7b69b522dda46164 (patch)
tree331d812429dd7a44390dd5bb067b85caf681f98e
parentd881174c2ecbc975f906758ae79f2fd4a491a779 (diff)
downloadexternal_python_setuptools-d7907a5c969ad05970e458cc7b69b522dda46164.tar.gz
external_python_setuptools-d7907a5c969ad05970e458cc7b69b522dda46164.tar.bz2
external_python_setuptools-d7907a5c969ad05970e458cc7b69b522dda46164.zip
Fix #272 - TypeError when namespace_package is unicode
--HG-- branch : distribute extra : rebase_source : 5bb6bc394dbe2834977b853af85241ae0a472de6
-rw-r--r--CHANGES.txt3
-rwxr-xr-xsetuptools/command/install_egg_info.py2
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c13ae20..cf901dc0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,9 @@ CHANGES
on Python 3.
* Issue #269: AttributeError when an exception occurs reading Manifest.in
on late releases of Python.
+* Issue #272: Prevent TypeError when namespace package names are unicode
+ and single-install-externally-managed is used. Also fixes PIP issue
+ 449.
------
0.6.24
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: