summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-05-15 23:43:19 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-05-15 23:43:19 -0400
commitc8c9b75cbb82654b463d3175430900f58ba951ca (patch)
treeeeb9830e1951fc4d1f8dc389e289c2288fd6c4ba /setuptools/command
parent2c63bb2e7c3dd6e27836630cec051e9d10891723 (diff)
downloadpython-setuptools-git-c8c9b75cbb82654b463d3175430900f58ba951ca.tar.gz
FileList.append already excludes files that are not UTF-8 encodable, so rely on it when building the manifest. Ref #193
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/egg_info.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index f6347af9..0175bbaa 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -252,21 +252,8 @@ class manifest_maker(sdist):
Write the file list in 'self.filelist' to the manifest file
named by 'self.manifest'.
"""
- # The manifest must be UTF-8 encodable. See #303.
- if sys.version_info >= (3,):
- files = []
- for file in self.filelist.files:
- try:
- file.encode("utf-8")
- except UnicodeEncodeError:
- log.warn("'%s' not UTF-8 encodable -- skipping" % file)
- else:
- files.append(file)
- self.filelist.files = files
-
- files = self.filelist.files
if os.sep!='/':
- files = [f.replace(os.sep,'/') for f in files]
+ files = [f.replace(os.sep,'/') for f in self.filelist.files]
self.execute(write_file, (self.manifest, files),
"writing manifest file '%s'" % self.manifest)