From b7c5bd34a32f20e54100fd88ede20c136571b1cf Mon Sep 17 00:00:00 2001 From: "Stefan H. Holek" Date: Sat, 10 Nov 2012 17:22:59 +0100 Subject: Windows can store UTF-8 bytes as is. --HG-- branch : distribute extra : rebase_source : 99e089901a7dac003a53d53e85b0c08480c86e27 --- setuptools/command/egg_info.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'setuptools') diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 8b29e672..9695627b 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -281,15 +281,19 @@ class FileList(_FileList): if item.endswith('\r'): # Fix older sdists built on Windows item = item[:-1] path = convert_path(item) - try: + if sys.version_info >= (3,): + try: + if os.path.exists(path): + self.files.append(path) + elif sys.platform == 'win32': + if os.path.exists(path.encode('utf-8')): + self.files.append(path) + except UnicodeEncodeError: + log.warn("%r not %s encodable -- skipping", path, + sys.getfilesystemencoding()) + else: if os.path.exists(path): self.files.append(path) - elif path != manifest_maker.template: - log.debug("%r not found -- skipping", path) - except UnicodeEncodeError: - log.warn("%r not %s encodable -- skipping", path, - sys.getfilesystemencoding()) - -- cgit v1.2.3