- Version update to 0.4.15:

* Few test tweaks
- Enable tests
- Add patch to fix gzip detection in tests:
  * magic-tests.patch
- Add patch to fix working with new file:
  * magic-new-file.patch
- Add patch to work with new mimedb:
  * magic-new-mime.patch
- Add patch magic-pep8.patch to have other patches apply cleanly

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-magic?expand=0&rev=9

0.4.15.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d730389249ab1e34ffb0a3c5beaa44e116687ffa081e0176dab6c59ff271593
+size 75476

magic-new-file.patch

@@ -0,0 +1,65 @@
+From 93492a12aa8ae55e62bce0472e92800eac4b6269 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Tue, 14 Aug 2018 11:14:19 +0200
+Subject: [PATCH] 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().
+---
+ test/test.py | 25 ++++++++++++++-----------
+ 1 file changed, 14 insertions(+), 11 deletions(-)
+
+Index: python-magic-0.4.15/test/test.py
+===================================================================
+--- python-magic-0.4.15.orig/test/test.py
++++ python-magic-0.4.15/test/test.py
+@@ -11,7 +11,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)
+@@ -22,15 +22,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())
+-
+-                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))
++            with open(filename, 'rb') as f:
++                buf_value = m.from_buffer(f.read())
++
++            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)
+@@ -67,9 +68,11 @@ class MagicTest(unittest.TestCase):
+                 ('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'),
++                 ': 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']
+ 

magic-new-mime.patch

@@ -0,0 +1,52 @@
+From 4bda684f8b461cc1f69593799efcf6afe8397756 Mon Sep 17 00:00:00 2001
+From: Adam Hupp <adam@hupp.org>
+Date: Sat, 9 Dec 2017 09:09:00 -0800
+Subject: [PATCH] fix test for xenial since travis started enabling it
+
+---
+ test/test.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+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 @@ def assert_values(self, m, expected_values):
+             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 @@ def test_from_buffer_str_and_bytes(self):
+         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 @@ def test_keep_going(self):
+ 
+         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 @@ def test_rethrow(self):
+             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

magic-pep8.patch

@@ -0,0 +1,207 @@
+From 828ff0289642a95ec00fe4f9a55da51c455277c8 Mon Sep 17 00:00:00 2001
+From: "Guido A.J. Stevens" <guido.stevens@cosent.nl>
+Date: Thu, 25 Jan 2018 08:29:18 +0000
+Subject: [PATCH] PEP8
+
+---
+ magic.py     | 30 ++++++++++++++++--------------
+ test/test.py | 29 ++++++++++++++++++-----------
+ 2 files changed, 34 insertions(+), 25 deletions(-)
+
+diff --git a/magic.py b/magic.py
+index dd86389..83b906d 100644
+--- a/magic.py
++++ b/magic.py
+@@ -19,7 +19,6 @@
+ 
+ import sys
+ import glob
+-import os.path
+ import ctypes
+ import ctypes.util
+ import threading
+@@ -63,7 +62,7 @@ def __init__(self, mime=False, magic_file=None, mime_encoding=False,
+ 
+         self.cookie = magic_open(self.flags)
+         self.lock = threading.Lock()
+-        
++
+         magic_load(self.cookie, magic_file)
+ 
+     def from_buffer(self, buf):
+@@ -76,7 +75,7 @@ def from_buffer(self, buf):
+                 # otherwise this string is passed as wchar*
+                 # which is not what libmagic expects
+                 if type(buf) == str and str != bytes:
+-                   buf = buf.encode('utf-8', errors='replace')
++                    buf = buf.encode('utf-8', errors='replace')
+                 return maybe_decode(magic_buffer(self.cookie, buf))
+             except MagicException as e:
+                 return self._handle509Bug(e)
+@@ -99,7 +98,7 @@ def _handle509Bug(self, e):
+             return "application/octet-stream"
+         else:
+             raise e
+-        
++
+     def __del__(self):
+         # no _thread_check here because there can be no other
+         # references to this object at this point.
+@@ -117,12 +116,14 @@ def __del__(self):
+ 
+ _instances = {}
+ 
++
+ def _get_magic_type(mime):
+     i = _instances.get(mime)
+     if i is None:
+         i = _instances[mime] = Magic(mime=mime)
+     return i
+ 
++
+ def from_file(filename, mime=False):
+     """"
+     Accepts a filename and returns the detected filetype.  Return
+@@ -135,6 +136,7 @@ def from_file(filename, mime=False):
+     m = _get_magic_type(mime)
+     return m.from_file(filename)
+ 
++
+ def from_buffer(buffer, mime=False):
+     """
+     Accepts a binary string and returns the detected filetype.  Return
+@@ -148,25 +150,25 @@ def from_buffer(buffer, mime=False):
+     return m.from_buffer(buffer)
+ 
+ 
+-
+-
+ libmagic = None
+ # Let's try to find magic or magic1
+-dll = ctypes.util.find_library('magic') or ctypes.util.find_library('magic1') or ctypes.util.find_library('cygmagic-1')
++dll = ctypes.util.find_library('magic') \
++    or ctypes.util.find_library('magic1') \
++    or ctypes.util.find_library('cygmagic-1')
+ 
+-# This is necessary because find_library returns None if it doesn't find the library
++# necessary because find_library returns None if it doesn't find the library
+ if dll:
+     libmagic = ctypes.CDLL(dll)
+ 
+ if not libmagic or not libmagic._name:
+-    windows_dlls = ['magic1.dll','cygmagic-1.dll']
++    windows_dlls = ['magic1.dll', 'cygmagic-1.dll']
+     platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
+                                   '/usr/local/lib/libmagic.dylib'] +
+-                         # Assumes there will only be one version installed
+-                         glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'),
++                       # Assumes there will only be one version installed
++                       glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'),  # flake8:noqa
+                        'win32': windows_dlls,
+                        'cygwin': windows_dlls,
+-                       'linux': ['libmagic.so.1'],    # fallback for some Linuxes (e.g. Alpine) where library search does not work
++                       'linux': ['libmagic.so.1'],  # fallback for some Linuxes (e.g. Alpine) where library search does not work # flake8:noqa
+                       }
+     platform = 'linux' if sys.platform.startswith('linux') else sys.platform
+     for dll in platform_to_lib.get(platform, []):
+@@ -204,13 +206,13 @@ def maybe_decode(s):
+         return s
+     else:
+         return s.decode('utf-8')
+-    
++
+ def coerce_filename(filename):
+     if filename is None:
+         return None
+ 
+     # ctypes will implicitly convert unicode strings to bytes with
+-    # .encode('ascii').  If you use the filesystem encoding 
++    # .encode('ascii').  If you use the filesystem encoding
+     # then you'll get inconsistent behavior (crashes) depending on the user's
+     # LANG environment variable
+     is_unicode = (sys.version_info[0] <= 2 and
+diff --git a/test/test.py b/test/test.py
+index c6e2d9c..a92972b 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -1,4 +1,4 @@
+-import os, sys
++import os
+ # for output which reports a local time
+ os.environ['TZ'] = 'GMT'
+ import shutil
+@@ -7,6 +7,7 @@
+ 
+ import magic
+ 
++
+ class MagicTest(unittest.TestCase):
+     TESTDATA_DIR = os.path.join(os.path.dirname(__file__), 'testdata')
+ 
+@@ -15,8 +16,8 @@ def assert_values(self, m, expected_values):
+             try:
+                 filename = os.path.join(self.TESTDATA_DIR, filename)
+             except TypeError:
+-                filename = os.path.join(self.TESTDATA_DIR.encode('utf-8'), filename)
+-
++                filename = os.path.join(
++                    self.TESTDATA_DIR.encode('utf-8'), filename)
+ 
+             if type(expected_value) is not tuple:
+                 expected_value = (expected_value,)
+@@ -39,7 +40,8 @@ def test_from_buffer_str_and_bytes(self):
+         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'))
++        dest = os.path.join(MagicTest.TESTDATA_DIR,
++                            b'\xce\xbb'.decode('utf-8'))
+         shutil.copyfile(os.path.join(MagicTest.TESTDATA_DIR, 'lambda'), dest)
+         try:
+             m = magic.Magic(mime=True)
+@@ -56,14 +58,16 @@ def test_mime_types(self):
+ 
+     def test_descriptions(self):
+         m = magic.Magic()
+-        os.environ['TZ'] = 'UTC'  # To get the last modified date of test.gz in UTC
++        os.environ['TZ'] = 'UTC'  # To get last modified date of test.gz in UTC
+         try:
+             self.assert_values(m, {
+                 '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'),
+                 'text.txt': 'ASCII text',
+             })
+         finally:
+@@ -94,18 +98,21 @@ def test_keep_going(self):
+         self.assertEqual(m.from_file(filename), 'image/jpeg')
+ 
+         m = magic.Magic(mime=True, keep_going=True)
+-        self.assertEqual(m.from_file(filename), 'image/jpeg\\012- application/octet-stream')
+-
++        self.assertEqual(m.from_file(filename),
++                         'image/jpeg\\012- application/octet-stream')
+ 
+     def test_rethrow(self):
+         old = magic.magic_buffer
+         try:
+-            def t(x,y):
++            def t(x, y):
+                 raise magic.MagicException("passthrough")
+             magic.magic_buffer = t
+ 
+-            self.assertRaises(magic.MagicException, magic.from_buffer, "hello", True)
++            with self.assertRaises(magic.MagicException):
++                magic.from_buffer("hello", True)
+         finally:
+             magic.magic_buffer = old
++
++
+ if __name__ == '__main__':
+     unittest.main()

magic-tests.patch

@@ -0,0 +1,22 @@
+From e83487a20bacd4f9b33d0478861671bf79468f59 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Mon, 13 Aug 2018 12:15:13 +0200
+Subject: [PATCH] Allow x-gzip as MIME type for gzip files, fixes #96
+
+---
+ test/test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index e29335f..e3ee703 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -54,7 +54,7 @@ def test_mime_types(self):
+             self.assert_values(m, {
+                 'magic._pyc_': 'application/octet-stream',
+                 'test.pdf': 'application/pdf',
+-                'test.gz': 'application/gzip',
++                'test.gz': ('application/gzip', 'application/x-gzip'),
+                 'text.txt': 'text/plain',
+                 b'\xce\xbb'.decode('utf-8'): 'text/plain',
+                 b'\xce\xbb': 'text/plain',

python-magic-0.4.13.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:604eace6f665809bebbb07070508dfa8cabb2d7cb05be9a56706c60f864f1289
-size 133478

python-python-magic.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Aug 21 10:31:23 UTC 2018 - tchvatal@suse.com
+
+- Version update to 0.4.15:
+  * Few test tweaks
+- Enable tests
+- Add patch to fix gzip detection in tests:
+  * magic-tests.patch
+- Add patch to fix working with new file:
+  * magic-new-file.patch
+- Add patch to work with new mimedb:
+  * magic-new-mime.patch
+- Add patch magic-pep8.patch to have other patches apply cleanly
+
 -------------------------------------------------------------------
 Thu Sep 14 00:17:15 UTC 2017 - toddrme2178@gmail.com
 

python-python-magic.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-python-magic
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,34 +17,32 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with     test
 %define         oldpython python
 Name:           python-python-magic
-Version:        0.4.13
+Version:        0.4.15
 Release:        0
 Summary:        File type identification using libmagic
 License:        Python-2.0
 Group:          Development/Languages/Python
-Url:            https://github.com/ahupp/python-magic
+URL:            https://github.com/ahupp/python-magic
-Source:         https://files.pythonhosted.org/packages/source/p/python-magic/python-magic-%{version}.tar.gz
+Source:         https://github.com/ahupp/python-magic/archive/%{version}.tar.gz
-BuildRequires:  %{python_module devel}
+Patch0:         magic-new-mime.patch
+Patch1:         magic-pep8.patch
+Patch2:         magic-tests.patch
+Patch3:         magic-new-file.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
 BuildRequires:  file
+BuildRequires:  python-rpm-macros
 Requires:       file
 # python-python-magic and python-magic use the same namespace (ie. filename)
 # and have a very similar functionality but are incompatible to each other.
-# Upstream discussions:
 #  https://github.com/ahupp/python-magic/issues/21
-# https://github.com/ahupp/python-magic/issues/33
-# https://github.com/ahupp/python-magic/issues/57
 Conflicts:      python-magic
+BuildArch:      noarch
 %ifpython2
 Conflicts:      %{oldpython}-magic
 %endif
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -54,6 +52,7 @@ supports both textual and MIME-type output.
 
 %prep
 %setup -q -n python-magic-%{version}
+%autopatch -p1
 
 %build
 %python_build
@@ -62,18 +61,12 @@ supports both textual and MIME-type output.
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with test}
 %check
-pushd test
-export PYTHONPATH='..'
 export LANG=en_US.UTF-8
-%python_exec test.py
+%python_exec setup.py test
-popd
-%endif
 
 %files %{python_files}
-%defattr(-,root,root,-)
+%license LICENSE
-%doc LICENSE
 %{python_sitelib}/magic.py*
 %pycache_only %{python_sitelib}/__pycache__/magic*.py*
 %{python_sitelib}/python_magic-%{version}-py*.egg-info