actually expose magic compat module, version 0.3.4

hatching · Jun 2, 2018 · d1b9219 · d1b9219
1 parent d52d719
commit d1b9219
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="SFlock",
-    version="0.3.3",
+    version="0.3.4",
     author="Jurriaan Bremer",
     author_email="jbr@cuckoo.sh",
     packages=[

diff --git a/sflock/__init__.py b/sflock/__init__.py
@@ -1,6 +1,7 @@
-# Copyright (C) 2015-2017 Jurriaan Bremer.
+# Copyright (C) 2015-2018 Jurriaan Bremer.
 # This file is part of SFlock - http://www.sflock.org/.
 # See the file 'docs/LICENSE.txt' for copying permission.
 
+from sflock.compat import magic
 from sflock.exception import UnpackException
 from sflock.main import ident, unpack, supported, zipify
diff --git a/tests/test_magic.py b/tests/test_magic.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2018 Jurriaan Bremer.
+# This file is part of SFlock - http://www.sflock.org/.
+# See the file 'docs/LICENSE.txt' for copying permission.
+
+from sflock import magic
+
+def test_magic():
+    assert magic.from_file("tests/files/maldoc.xls").startswith((
+        "Composite Document File V2", "CDF V2 Document"
+    ))
+    assert magic.from_file("tests/files/test.hta_").startswith(
+        "HTML document"
+    )
+    assert magic.from_file("tests/files/cab2.cab").startswith(
+        "Microsoft Cabinet"
+    )