summaryrefslogtreecommitdiff
path: root/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-07-12 18:44:36 +0200
committerMichał Górny <mgorny@gentoo.org>2020-07-12 18:54:52 +0200
commit8ddb9b24be02f333158b8326e9ca1e8207917102 (patch)
tree2689a2492eb1ab3c10c4be400e3da71145332181 /dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch
parent98255d563fbd2d54259f17a6efd4934a87900627 (diff)
downloadgentoo-8ddb9b24be02f333158b8326e9ca1e8207917102.tar.gz
gentoo-8ddb9b24be02f333158b8326e9ca1e8207917102.tar.bz2
gentoo-8ddb9b24be02f333158b8326e9ca1e8207917102.zip
dev-python/python-magic: Remove redundant versions
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch')
-rw-r--r--dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch
deleted file mode 100644
index 9efb34b6672e..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.15-fix-jpeg-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 4bda684f8b461cc1f69593799efcf6afe8397756
-Author: Adam Hupp <adam@hupp.org>
-Date: Sat Dec 9 09:09:00 2017 -0800
-
- fix test for xenial since travis started enabling it
-
-diff --git a/test/test.py b/test/test.py
-index addccc6..c6e2d9c 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -17,7 +17,7 @@ class MagicTest(unittest.TestCase):
- except TypeError:
- filename = os.path.join(self.TESTDATA_DIR.encode('utf-8'), filename)
-
--
-+
- if type(expected_value) is not tuple:
- expected_value = (expected_value,)
-
-@@ -37,7 +37,7 @@ class MagicTest(unittest.TestCase):
- self.assertEqual("text/x-python", m.from_buffer(s))
- b = b'#!/usr/bin/env python\nprint("foo")'
- self.assertEqual("text/x-python", m.from_buffer(b))
--
-+
- def test_mime_types(self):
- dest = os.path.join(MagicTest.TESTDATA_DIR, b'\xce\xbb'.decode('utf-8'))
- shutil.copyfile(os.path.join(MagicTest.TESTDATA_DIR, 'lambda'), dest)
-@@ -92,9 +92,9 @@ class MagicTest(unittest.TestCase):
-
- m = magic.Magic(mime=True)
- self.assertEqual(m.from_file(filename), 'image/jpeg')
--
-+
- m = magic.Magic(mime=True, keep_going=True)
-- self.assertEqual(m.from_file(filename), 'image/jpeg')
-+ self.assertEqual(m.from_file(filename), 'image/jpeg\\012- application/octet-stream')
-
-
- def test_rethrow(self):
-@@ -103,7 +103,7 @@ class MagicTest(unittest.TestCase):
- def t(x,y):
- raise magic.MagicException("passthrough")
- magic.magic_buffer = t
--
-+
- self.assertRaises(magic.MagicException, magic.from_buffer, "hello", True)
- finally:
- magic.magic_buffer = old