|
@@ -11,37 +11,39 @@ Taken from pyudev issue 117 discussion:
|
|
|
https://github.com/pyudev/pyudev/pull/117
|
|
|
|
|
|
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
|
|
|
+[Marcin: adjust to 0.22.0]
|
|
|
+Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
|
|
|
---
|
|
|
- src/pyudev/_libudev.py | 8 ++++----
|
|
|
+ src/pyudev/_ctypeslib/utils.py | 8 ++++----
|
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
|
|
-diff --git a/src/pyudev/_libudev.py b/src/pyudev/_libudev.py
|
|
|
-index a0de8fb..1348d17 100644
|
|
|
---- a/src/pyudev/_libudev.py
|
|
|
-+++ b/src/pyudev/_libudev.py
|
|
|
-@@ -30,7 +30,7 @@
|
|
|
- from __future__ import (print_function, division, unicode_literals,
|
|
|
- absolute_import)
|
|
|
+diff --git a/src/pyudev/_ctypeslib/utils.py b/src/pyudev/_ctypeslib/utils.py
|
|
|
+index 9dffb3c..aa9942f 100644
|
|
|
+--- a/src/pyudev/_ctypeslib/utils.py
|
|
|
++++ b/src/pyudev/_ctypeslib/utils.py
|
|
|
+@@ -28,7 +28,7 @@
|
|
|
+ from __future__ import print_function
|
|
|
+ from __future__ import unicode_literals
|
|
|
|
|
|
--from ctypes import (CDLL, Structure, POINTER,
|
|
|
-+from ctypes import (cdll, CDLL, Structure, POINTER,
|
|
|
- c_char, c_char_p, c_int, c_uint, c_ulonglong)
|
|
|
+-from ctypes import CDLL
|
|
|
++from ctypes import cdll, CDLL
|
|
|
from ctypes.util import find_library
|
|
|
|
|
|
-@@ -265,10 +265,10 @@ def load_udev_library():
|
|
|
|
|
|
- Raise :exc:`~exceptions.ImportError`, if the udev library was not found.
|
|
|
+@@ -50,10 +50,10 @@ def load_ctypes_library(name, signatures, error_checkers):
|
|
|
+ :rtype: ctypes.CDLL
|
|
|
+ :raises ImportError: if the library is not found
|
|
|
"""
|
|
|
-- udev_library_name = find_library('udev')
|
|
|
-- if not udev_library_name:
|
|
|
+- library_name = find_library(name)
|
|
|
+- if not library_name:
|
|
|
+ try:
|
|
|
-+ libudev = cdll.LoadLibrary('libudev.so')
|
|
|
++ lib = cdll.LoadLibrary(f'lib{name}.so')
|
|
|
+ except OSError:
|
|
|
- raise ImportError('No library named udev')
|
|
|
-- libudev = CDLL(udev_library_name, use_errno=True)
|
|
|
- # context function signature
|
|
|
- for namespace, members in SIGNATURES.items():
|
|
|
- for funcname in members:
|
|
|
+ raise ImportError('No library named %s' % name)
|
|
|
+- lib = CDLL(library_name, use_errno=True)
|
|
|
+ # Add function signatures
|
|
|
+ for funcname, signature in signatures.items():
|
|
|
+ function = getattr(lib, funcname, None)
|
|
|
--
|
|
|
-2.1.4
|
|
|
+2.29.1
|
|
|
|