Merge the backout. Mercurial is killing me.

--HG--
branch : distribute
extra : rebase_source : 8315b86467e945ff108461f97af20358384a513f

1 files changed, 5 insertions, 6 deletions

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index ad02cec8..098dfe84 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,15 +281,14 @@ 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())