summaryrefslogtreecommitdiff
path: root/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-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-buffer-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-buffer-test.patch')
-rw-r--r--dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch65
1 files changed, 0 insertions, 65 deletions
diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch
deleted file mode 100644
index 75a769b6a5f5..000000000000
--- a/dev-python/python-magic/files/python-magic-0.4.15-fix-buffer-test.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit acfda9c26df888741805249f3ec0f60f369fc664
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date: Tue Aug 14 11:14:19 2018 +0200
-
- Tests: allow differences when reading a buffer or a file, fixes #173
-
- Also remove the loop in order to avoid analyzing files or buffers for each
- expected value, replace it with a call to assertIn().
-
-diff --git a/test/test.py b/test/test.py
-index addccc6..67957ee 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -10,7 +10,7 @@ import magic
- class MagicTest(unittest.TestCase):
- TESTDATA_DIR = os.path.join(os.path.dirname(__file__), 'testdata')
-
-- def assert_values(self, m, expected_values):
-+ def assert_values(self, m, expected_values, buf_equals_file=True):
- for filename, expected_value in expected_values.items():
- try:
- filename = os.path.join(self.TESTDATA_DIR, filename)
-@@ -21,15 +21,16 @@ class MagicTest(unittest.TestCase):
- if type(expected_value) is not tuple:
- expected_value = (expected_value,)
-
-- for i in expected_value:
-- with open(filename, 'rb') as f:
-- buf_value = m.from_buffer(f.read())
-+ with open(filename, 'rb') as f:
-+ buf_value = m.from_buffer(f.read())
-
-- file_value = m.from_file(filename)
-- if buf_value == i and file_value == i:
-- break
-- else:
-- self.assertTrue(False, "no match for " + repr(expected_value))
-+ file_value = m.from_file(filename)
-+
-+ if buf_equals_file:
-+ self.assertEqual(buf_value, file_value)
-+
-+ for value in (buf_value, file_value):
-+ self.assertIn(value, expected_value)
-
- def test_from_buffer_str_and_bytes(self):
- m = magic.Magic(mime=True)
-@@ -62,10 +63,14 @@ class MagicTest(unittest.TestCase):
- 'magic._pyc_': 'python 2.4 byte-compiled',
- 'test.pdf': 'PDF document, version 1.2',
- 'test.gz':
-- ('gzip compressed data, was "test", from Unix, last modified: Sun Jun 29 01:32:52 2008',
-- 'gzip compressed data, was "test", last modified: Sun Jun 29 01:32:52 2008, from Unix'),
-+ ('gzip compressed data, was "test", from Unix, last '
-+ 'modified: Sun Jun 29 01:32:52 2008',
-+ 'gzip compressed data, was "test", last modified'
-+ ': Sun Jun 29 01:32:52 2008, from Unix',
-+ 'gzip compressed data, was "test", last modified'
-+ ': Sun Jun 29 01:32:52 2008, from Unix, original size 15'),
- 'text.txt': 'ASCII text',
-- })
-+ }, buf_equals_file=False)
- finally:
- del os.environ['TZ']
-