diff options
| author | Stefan H. Holek <stefan@epy.co.at> | 2012-11-10 02:05:17 +0100 |
|---|---|---|
| committer | Stefan H. Holek <stefan@epy.co.at> | 2012-11-10 02:05:17 +0100 |
| commit | e69eb1098a650ba05b6ef998d8a118cbc10365a7 (patch) | |
| tree | 329cdb67d5eebbb042b231e436933e96fc1c97e2 | |
| parent | 924d4355aeacd172c32ce6a894f3c141bc363991 (diff) | |
| download | external_python_setuptools-e69eb1098a650ba05b6ef998d8a118cbc10365a7.tar.gz external_python_setuptools-e69eb1098a650ba05b6ef998d8a118cbc10365a7.tar.bz2 external_python_setuptools-e69eb1098a650ba05b6ef998d8a118cbc10365a7.zip | |
Never skip because of encoding in append.
--HG--
branch : distribute
extra : rebase_source : 89414e7f828ed2ca2b7118dfd5e17c72ccc44f5b
| -rwxr-xr-x | setuptools/command/egg_info.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 098dfe84..ad02cec8 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -281,14 +281,15 @@ class FileList(_FileList): if item.endswith('\r'): # Fix older sdists built on Windows item = item[:-1] path = convert_path(item) + # Filter unused template files all of which have ASCII names try: + if sys.version_info >= (3,): + path.encode('ascii') + except UnicodeEncodeError: + self.files.append(path) + else: if os.path.exists(path): self.files.append(path) - elif path != manifest_maker.template: - log.warn("%r not found -- skipping", path) - except UnicodeEncodeError: - log.warn("%r not %s encodable -- skipping", path, - sys.getfilesystemencoding()) |