From 60a42fcd2ae461bac7bbe93af92a9d7e0d13b746 Mon Sep 17 00:00:00 2001 From: Philip Thiem Date: Sat, 17 May 2014 02:40:07 -0500 Subject: with_statements and output utf-8 output *Since py2.5 has been dropped, we can use future imports to make use of with statements. *End goal was to always decode to utf-8 in write_file on 307 --HG-- extra : rebase_source : 502ea7128f4e3b843b16c6d64d6d0b2ac56ce87d --- setuptools/command/egg_info.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'setuptools/command') diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 2097f2a9..1eca04ad 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -1,6 +1,7 @@ """setuptools.command.egg_info Create a distribution's .egg-info directory and contents""" +from __future__ import with_statement import os import re @@ -10,7 +11,7 @@ from setuptools import Command import distutils.errors from distutils import log from setuptools.command.sdist import sdist -from setuptools.compat import basestring, PY3 +from setuptools.compat import basestring, PY3, unicode from setuptools import svn_utils from distutils.util import convert_path from distutils.filelist import FileList as _FileList @@ -303,11 +304,13 @@ def write_file(filename, contents): sequence of strings without line terminators) to it. """ contents = "\n".join(contents) - if sys.version_info >= (3,): - contents = contents.encode("utf-8") - f = open(filename, "wb") # always write POSIX-style manifest - f.write(contents) - f.close() + + #assuming the contents has been vetted for utf-8 encoding + contents = contents.encode("utf-8") + + with open(filename, "wb") as f: # always write POSIX-style manifest + f.write(contents) + def write_pkg_info(cmd, basename, filename): log.info("writing %s", filename) -- cgit v1.2.3 From cade48d7d2751fe69d81957963f0a12d1606c9f6 Mon Sep 17 00:00:00 2001 From: Philip Thiem Date: Sat, 17 May 2014 04:15:55 -0500 Subject: In corporate the old unicode with the spirit of what the FileList updating. --HG-- extra : source : 199c917b8a0be209144878872269c3bd08936d6a --- setuptools/command/egg_info.py | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'setuptools/command') diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 1eca04ad..33fe147e 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -18,6 +18,7 @@ from distutils.filelist import FileList as _FileList from pkg_resources import (parse_requirements, safe_name, parse_version, safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename) from setuptools.command.sdist import walk_revctrl +import setuptools.unicode_utils as unicode_utils class egg_info(Command): @@ -227,15 +228,28 @@ class FileList(_FileList): self.files = list(filter(self._safe_path, self.files)) def _safe_path(self, path): - if not PY3: - return os.path.exists(path) + enc_warn = "'%s' not %s encodable -- skipping" + + #To avoid accidental trans-codings errors, first to unicode + u_path = unicode_utils.filesys_decode(path) + if u_path is None: + log.warn("'%s' in unexpected encoding -- skipping" % path) + return False + + #Must ensure utf-8 encodability + utf8_path = unicode_utils.try_encode(u_path, "utf-8") + if utf8_path is None: + log.warn(enc_warn, path, 'utf-8') + return False try: - if os.path.exists(path) or os.path.exists(path.encode('utf-8')): + #accept is either way checks out + if os.path.exists(u_path) or os.path.exists(utf8_path): return True + #this will catch any encode errors decoding u_path except UnicodeEncodeError: - log.warn("'%s' not %s encodable -- skipping", path, - sys.getfilesystemencoding()) + log.warn(enc_warn, path, sys.getfilesystemencoding()) + class manifest_maker(sdist): @@ -263,6 +277,10 @@ class manifest_maker(sdist): self.filelist.remove_duplicates() self.write_manifest() + def _manifest_normalize(self, path): + path = unicode_utils.filesys_decode(path) + return path.replace(os.sep, '/') + def write_manifest(self): """ Write the file list in 'self.filelist' to the manifest file @@ -270,7 +288,8 @@ class manifest_maker(sdist): """ self.filelist._repair() - files = [f.replace(os.sep, '/') for f in self.filelist.files] + #Now _repairs should encodability, but not unicode + files = [self._manifest_normalize(f) for f in self.filelist.files] msg = "writing manifest file '%s'" % self.manifest self.execute(write_file, (self.manifest, files), msg) -- cgit v1.2.3