Merge pull request #157 from StevenMaude/fix-python-magic-from-buffer

Fix for Python Magic API change
okfn · Sep 29, 2016 · 38673cc · 38673cc
2 parents d006183 + 81076ff
commit 38673cc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,9 @@ python:
   - "2.7"
   - "3.4"
 install:
+  # Fix for html5lib, probably can be removed after the version after
+  # 0.999999999/1.0b10 is released.
+  - pip install --upgrade setuptools
   - pip install -e .
   - pip install -r requirements-test.txt
   - pip install coveralls

diff --git a/messytables/any.py b/messytables/any.py
@@ -64,7 +64,7 @@ def get_mime(fileobj):
     # seek back later. If not, slurp in the contents into a StringIO.
     fileobj = messytables.seekable_stream(fileobj)
     header = fileobj.read(4096)
-    mimetype = magic.from_buffer(header, mime=True).decode('utf-8')
+    mimetype = magic.from_buffer(header, mime=True)
     fileobj.seek(0)
     if MIMELOOKUP.get(mimetype) == 'ZIP':
         # consider whether it's an Microsoft Office document

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -3,7 +3,7 @@ nose==1.3.6
 requests==2.2.1
 # pdftables==0.0.4
 xlrd==0.9.3
-python-magic==0.4.6
+python-magic==0.4.12
 chardet==2.3.0
 python-dateutil==2.4.2
 lxml==3.3.3

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
     zip_safe=False,
     install_requires=[
         'xlrd>=0.8.0',
-        'python-magic>=0.4.6',  # used for type guessing
+        'python-magic>=0.4.12',  # used for type guessing
         'chardet>=2.3.0',
         'python-dateutil>=1.5.0',
         'lxml>=3.2',