Skip to content
Open
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ec952d7
Build platform-specific wheels containing libmagic
ddelange Sep 7, 2023
a437409
Move persmissions into job scope, remove ABI3 reference
ddelange Sep 15, 2023
4a715e2
Switch to PyPI trusted publishing
ddelange Nov 13, 2023
1adc0a5
Add CIBW_TEST_COMMAND and indent Makefile
ddelange Jan 25, 2024
20e2dc9
Merge branch 'master' of https://github.com/ahupp/python-magic into a…
ddelange Jan 25, 2024
090b1d4
Fix CI for macos
ddelange Jan 25, 2024
20d8fee
Add dependabot.yml
ddelange Jan 25, 2024
85d4422
Migrate actions/upload-artifact@v4
ddelange Jan 25, 2024
2efa36d
Ensure magic.mgc packaged in wheel gets recognised
ddelange Jan 25, 2024
0b43bc6
Add note about --no-binary to the installation instructions
ddelange Apr 1, 2024
05df4f9
Separate mac versions
ddelange Apr 4, 2024
d2972b9
Update cibuildwheel
ddelange Apr 4, 2024
e182ae1
Bump pypa/gh-action-pypi-publish@v1.8.14
ddelange Apr 4, 2024
94718d5
Bump cibuildwheel docker images
ddelange Apr 11, 2024
359e007
Revert "Bump cibuildwheel docker images"
ddelange Apr 11, 2024
bb9c685
Move magic.mgc injection into Magic class
ddelange Apr 11, 2024
b0fddf3
Build on more recent cibw images
ddelange Apr 11, 2024
dc075e9
Use hls mp4 (recent libmagic only) for testing
ddelange Apr 11, 2024
144132d
Revert "Use hls mp4 (recent libmagic only) for testing"
ddelange Apr 11, 2024
fe62a26
Install from source
ddelange Apr 23, 2024
f7bbb03
Documentation and readability
ddelange Apr 24, 2024
2e6104e
Build macos wheels with maximum backwards compatibility
ddelange May 6, 2024
ca4def3
Use CIBW_SKIP
ddelange May 6, 2024
ba87ffd
Apply suggestions from code review
ddelange May 20, 2024
e112de3
Merge branch 'master' of ahupp/python-magic into abi3-wheels
ddelange May 22, 2024
eba05b6
Fix compat.py now that bundled libmagic is preferred
ddelange May 22, 2024
8381a96
Fix https://github.com/ahupp/python-magic/issues/321
ddelange May 22, 2024
9c5f955
Use sudo on ubuntu-latest in ci.yml
ddelange May 22, 2024
e6d5ed0
Fix sudo not available on windows-latest
ddelange May 22, 2024
50504a2
Merge branch 'ahupp:master' into abi3-wheels
ddelange May 22, 2024
9357f27
Add entries in CHANGELOG
ddelange May 23, 2024
53d099b
Merge branch 'master' of https://github.com/ahupp/python-magic into a…
ddelange May 26, 2024
9bf2e9c
Fix test
ddelange May 26, 2024
f7341ce
PR Suggestions
ddelange May 26, 2024
da5b330
Apply suggestions from code review
ddelange May 28, 2024
258efa4
Revert partially: fix install on Windows
ddelange May 29, 2024
3a55538
Merge branch 'master' into abi3-wheels
ddelange Jun 18, 2024
65fb61c
Apply suggestions from code review
ddelange Jun 26, 2024
43c0c99
Merge branch 'master' of https://github.com/ahupp/python-magic into a…
ddelange Feb 14, 2025
3e51048
Fix tests
ddelange Feb 14, 2025
d7b1171
Use older typing syntax
ddelange Feb 14, 2025
620d78f
Use older typing syntax
ddelange Feb 14, 2025
d3e886c
Apply suggestions from code review
ddelange Feb 14, 2025
2bb9fa8
Merge branch 'master' of https://github.com/ahupp/python-magic into a…
ddelange Feb 19, 2025
c8a599b
Merge branch 'master' of https://github.com/ahupp/python-magic into a…
ddelange Mar 12, 2025
e1b154c
Run ruff format
ddelange Mar 12, 2025
d111ace
Skip install_source on windows
ddelange Mar 15, 2025
33c827e
Typo
ddelange Mar 15, 2025
688edf0
Get latest libmagic from MSYS2 for Windows (#10)
ddelange Mar 18, 2025
9dd2ebc
Remove dev leftover
ddelange Mar 21, 2025
57b2559
Merge branch 'master' into abi3-wheels
ddelange Aug 11, 2025
ed077fc
Update README.md
ddelange Aug 11, 2025
0571c11
Mention MSYS2 for Windows in README.md
ddelange Aug 13, 2025
ead0595
Merge branch 'ahupp:master' into abi3-wheels
ddelange Aug 18, 2025
3ebe8bc
Bump macos-13 to macos-15-intel
ddelange Oct 2, 2025
b4c04a3
Build wheels on cp313
ddelange Oct 3, 2025
49982d2
update coerce_filename
thc1102 Oct 10, 2025
f99e6de
Revert "Build wheels on cp313"
ddelange Oct 10, 2025
f35ff40
Merge branch 'master' into abi3-wheels
ddelange Oct 13, 2025
2f69c71
Merge branch 'ahupp:master' into abi3-wheels
ddelange Mar 3, 2026
a530c13
Bump to file-5.47
ddelange Mar 21, 2026
04d2587
Revert "Bump to file-5.47" because of #362
ddelange Mar 21, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion magic/__init__.py
Copy link
Copy Markdown
Contributor Author

@ddelange ddelange Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

49982d2 is a git cherry-pick from https://github.com/thc1102/python-magic to fix #287 / #335

Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import threading
import logging

from locale import getpreferredencoding
from ctypes import c_char_p, c_int, c_size_t, c_void_p, byref, POINTER


Expand Down Expand Up @@ -318,7 +319,7 @@ def coerce_filename(filename):
sys.version_info[0] >= 3 and isinstance(filename, str)
)
if is_unicode:
return filename.encode("utf-8", "surrogateescape")
return filename.encode(getpreferredencoding(), "surrogateescape")
else:
return filename

Expand Down