summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Hupp <adam@hupp.org>2021-02-16 20:01:28 -0800
committerAdam Hupp <adam@hupp.org>2021-02-16 20:01:28 -0800
commite0ccc6d0cbf7b17e8c7288297c717f3b3d499679 (patch)
treeb7a6036a25ffd07a2df04e7dff369378a6d25c32
parentfc28c87e010eed27fce37615202280feebaa1fc0 (diff)
downloadpython-magic-e0ccc6d0cbf7b17e8c7288297c717f3b3d499679.tar.gz
Fix yet another import error0.4.22
Seems to hit windows, probably OSX. We have great test coverage across linux distros, not so much elsewhere. Tested on my windows box by manually installing the wheel file.
-rw-r--r--CHANGELOG2
-rw-r--r--magic/loader.py1
-rw-r--r--setup.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a7d109e..fbabad6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes to 0.4.21
+Changes to 0.4.21, 0.4.22
- Unify dll loader between the standard and compat library, fixing load
failures on some previously supported platforms.
diff --git a/magic/loader.py b/magic/loader.py
index 6a47d52..6b2bfcb 100644
--- a/magic/loader.py
+++ b/magic/loader.py
@@ -1,5 +1,6 @@
import ctypes
import sys
+import glob
def load_lib():
libmagic = None
diff --git a/setup.py b/setup.py
index d5b6c93..3b5489a 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setuptools.setup(
author='Adam Hupp',
author_email='adam@hupp.org',
url="http://github.com/ahupp/python-magic",
- version='0.4.21',
+ version='0.4.22',
long_description=read('README.md'),
long_description_content_type='text/markdown',
packages=['magic'],