aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2007-02-17 17:55:43 +0000
committerPJ Eby <distutils-sig@python.org>2007-02-17 17:55:43 +0000
commit2fd26408a3a261ceb6edde9eeda821677e2f9df4 (patch)
treebf5c7f80f2e759a0659cb9139b7a9258e01bf528 /setuptools/command/easy_install.py
parent8acf86a7ba74247eb0b2533ac514062a2be5f5e8 (diff)
downloadexternal_python_setuptools-2fd26408a3a261ceb6edde9eeda821677e2f9df4.tar.gz
external_python_setuptools-2fd26408a3a261ceb6edde9eeda821677e2f9df4.tar.bz2
external_python_setuptools-2fd26408a3a261ceb6edde9eeda821677e2f9df4.zip
Fix error if script contains null byte. (backport from trunk)
--HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053814
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c8e0938b..5b7d001d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1460,7 +1460,7 @@ def is_python(text, filename='<string>'):
"Is this string a valid Python script?"
try:
compile(text, filename, 'exec')
- except SyntaxError:
+ except (SyntaxError, TypeError):
return False
else:
return True