<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2771b1fc9c2a7ef5909c5ecbeca3b4e14aabbe3e">https://github.com/macports/macports-ports/commit/2771b1fc9c2a7ef5909c5ecbeca3b4e14aabbe3e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2771b1fc9c2 py-magic: fix patchfile issue
</span>2771b1fc9c2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2771b1fc9c2a7ef5909c5ecbeca3b4e14aabbe3e
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Fri Mar 19 19:51:49 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-magic: fix patchfile issue
</span>---
python/py-magic/files/magic_loader.py | 37 ------------------------
python/py-magic/files/patch-magic_loader.py.diff | 33 ++++++++++++---------
2 files changed, 20 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/files/magic_loader.py b/python/py-magic/files/magic_loader.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b95c07f54bc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magic/files/magic_loader.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-import ctypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-import glob
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-def load_lib():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmagic = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Let's try to find magic or magic1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dll = ctypes.util.find_library('magic') \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or ctypes.util.find_library('magic1') \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or ctypes.util.find_library('cygmagic-1') \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or ctypes.util.find_library('libmagic-1') \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or ctypes.util.find_library('msys-magic-1') # for MSYS2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # necessary because find_library returns None if it doesn't find the library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if dll:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmagic = ctypes.CDLL(dll)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'win32': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cygwin': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'linux': ['libmagic.so.1'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fallback for some Linuxes (e.g. Alpine) where library search does not work # flake8:noqa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform = 'linux' if sys.platform.startswith('linux') else sys.platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dll in platform_to_lib.get(platform, []):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmagic = ctypes.CDLL(dll)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except OSError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It is better to raise an ImportError since we are importing magic module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise ImportError('failed to find libmagic. Check your installation')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return libmagic
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/files/patch-magic_loader.py.diff b/python/py-magic/files/patch-magic_loader.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c3641f1974b..b9488ee19f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magic/files/patch-magic_loader.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-magic/files/patch-magic_loader.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- magic.py.orig 2020-05-06 05:14:40.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ magic.py 2020-05-12 19:50:40.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,10 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- magic/loader.py.orig 2021-03-12 13:23:04.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ magic/loader.py 2021-03-12 13:24:56.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,10 +17,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '/usr/local/lib/libmagic.dylib'] +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Assumes there will only be one version installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'), # flake8:noqa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'win32': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cygwin': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'linux': ['libmagic.so.1'], # fallback for some Linuxes (e.g. Alpine) where library search does not work # flake8:noqa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/usr/local/lib/libmagic.dylib'] +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Assumes there will only be one version installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'), # flake8:noqa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'win32': windows_dlls,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'cygwin': windows_dlls,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'linux': ['libmagic.so.1'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,4 +34,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It is better to raise an ImportError since we are importing magic module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise ImportError('failed to find libmagic. Check your installation')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return libmagic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return libmagic
</span></pre><pre style='margin:0'>
</pre>