From f266bc3745169122fcfcacb781e7e3c70fc58bfb Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Thu, 1 Nov 2012 11:47:24 +0100
Subject: Skip undecodable filenames in read_manifest as well.

--HG--
branch : distribute
extra : rebase_source : 2dda494b1a4758e84dde81cc61170acd0e55d2f2
---
 setuptools/command/sdist.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'setuptools/command')

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 79eed214..7a6d2b7d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -283,8 +283,11 @@ class sdist(_sdist):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             if sys.version_info >= (3,):
-                # Don't break if surrogates have crept into the manifest
-                line = line.decode('UTF-8', 'surrogateescape')
+                try:
+                    line = line.decode('UTF-8')
+                except UnicodeDecodeError:
+                    log.warn("%r not UTF-8 decodable -- skipping" % line)
+                    continue
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line:
-- 
cgit v1.2.1