Merge branch 'ahupp:master' into abi3-wheels

Author: ddelange

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
           #   python-version: '3.13'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}

magic/__init__.py

@@ -18,11 +18,7 @@
 
 import sys
 import os
-import glob
-import ctypes
-import ctypes.util
 import threading
-import logging
 
 from locale import getpreferredencoding
 from ctypes import c_char_p, c_int, c_size_t, c_void_p, byref, POINTER
@@ -259,7 +255,7 @@ def from_descriptor(fd, mime=False):
 
 libmagic = loader.load_lib()
 
-magic_t = ctypes.c_void_p
+magic_t = c_void_p
 
 
 def errorcheck_null(result, func, args):

magic/compat.py

@@ -10,7 +10,6 @@
 from collections import namedtuple
 
 from ctypes import *
-from ctypes.util import find_library
 
 from . import loader