More Windows fixes

CAPESandbox · May 31, 2024 · 2072440 · 2072440
1 parent 06a04b9
commit 2072440
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 *.a
 *.o
-*.dll
 *.exe
 *.so
 *.pyc

diff --git a/sflock/data/win32/libmagic.dll b/sflock/data/win32/libmagic.dll
diff --git a/sflock/data/win32/magic.mgc b/sflock/data/win32/magic.mgc
diff --git a/sflock/data/win32/magic1.dll b/sflock/data/win32/magic1.dll
diff --git a/sflock/data/win64/libmagic.dll b/sflock/data/win64/libmagic.dll
diff --git a/sflock/data/win64/magic.mgc b/sflock/data/win64/magic.mgc
diff --git a/sflock/data/win64/magic1.dll b/sflock/data/win64/magic1.dll
diff --git a/sflock/misc.py b/sflock/misc.py
@@ -31,8 +31,8 @@ def import_plugins(dirpath, module_prefix, namespace, class_):
 
 def data_file(*path):
     """Return the path for the filepath of an embedded file."""
-    dirpath = sflock.__path__[0].encode()
-    return os.path.abspath(os.path.join(dirpath, b"data", *path))
+    dirpath = sflock.__path__[0]
+    return os.path.abspath(os.path.join(dirpath, "data", *path))
 
 
 def make_list(obj):