From e69eb1098a650ba05b6ef998d8a118cbc10365a7 Mon Sep 17 00:00:00 2001 From: "Stefan H. Holek" Date: Sat, 10 Nov 2012 02:05:17 +0100 Subject: Never skip because of encoding in append. --HG-- branch : distribute extra : rebase_source : 89414e7f828ed2ca2b7118dfd5e17c72ccc44f5b --- setuptools/command/egg_info.py | 11 ++++++----- 1 file 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()) -- cgit v1.2.3