From 6aabe0a6b3a69410d5e51db768d547900a8a6b26 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Oct 28 2013 19:12:40 +0000 Subject: Remove patch that's been applied upstream. --- diff --git a/distribute-skip-sdist_with_utf8_encoded_filename.patch b/distribute-skip-sdist_with_utf8_encoded_filename.patch deleted file mode 100644 index a473a18..0000000 --- a/distribute-skip-sdist_with_utf8_encoded_filename.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: setuptools-0.8b7/setuptools/tests/test_sdist.py -=================================================================== ---- setuptools-0.8b7.orig/setuptools/tests/test_sdist.py -+++ setuptools-0.8b7/setuptools/tests/test_sdist.py -@@ -1,7 +1,7 @@ - # -*- coding: utf-8 -*- - """sdist tests""" - -- -+import locale - import os - import shutil - import sys -@@ -9,6 +9,7 @@ import tempfile - import unittest - import unicodedata - -+from setuptools.tests.py26compat import skipIf - from setuptools.compat import StringIO, unicode - from setuptools.command.sdist import sdist - from setuptools.command.egg_info import manifest_maker -@@ -318,6 +319,8 @@ class TestSdistTest(unittest.TestCase): - filename = filename.decode('latin-1') - self.assertFalse(filename in cmd.filelist.files) - -+ @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8', -+ 'Unittest fails if locale is not utf-8 but the manifests is recorded correctly') - def test_sdist_with_utf8_encoded_filename(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS)