[Python-modules-commits] [pyudev] 04/10: merge patched into master
Felix Geyer
fgeyer at moszumanska.debian.org
Fri Sep 9 21:44:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
fgeyer pushed a commit to branch master
in repository pyudev.
commit 44148e7b0b870fe2e5a5f07aceb09a89935ee99c
Merge: dbc9b7c fbaba6e
Author: Felix Geyer <fgeyer at debian.org>
Date: Fri Sep 9 22:25:12 2016 +0200
merge patched into master
CHANGES.rst | 26 +-
MANIFEST.in | 1 +
PKG-INFO | 4 +-
README.rst | 2 +-
debian/.git-dpm | 6 +-
debian/patches/libudev_loading.diff | 50 ++-
doc/guide.rst | 13 +-
doc/tests/running.rst | 21 -
reproducers/1255191.c | 32 --
reproducers/1263351.c | 47 ---
reproducers/1263351a.c | 48 ---
reproducers/1265315.c | 62 ---
reproducers/1265315.py | 45 --
reproducers/1297512.c | 51 ---
reproducers/1297512.py | 34 --
reproducers/1302359.c | 54 ---
src/pyudev.egg-info/PKG-INFO | 4 +-
src/pyudev.egg-info/SOURCES.txt | 18 +-
src/pyudev/__init__.py | 34 +-
src/pyudev/_ctypeslib/_errorcheckers.py | 6 +-
src/pyudev/_ctypeslib/libc.py | 33 +-
src/pyudev/_ctypeslib/libudev.py | 392 +++++++++---------
src/pyudev/_ctypeslib/{libc.py => utils.py} | 56 ++-
src/pyudev/_os/pipe.py | 6 +-
src/pyudev/_parsing/__init__.py | 39 --
src/pyudev/_parsing/_devlink.py | 101 -----
src/pyudev/_parsing/_id_path.py | 171 --------
src/pyudev/_parsing/_pci_address.py | 60 ---
src/pyudev/_parsing/_shared.py | 118 ------
src/pyudev/_qt_base.py | 4 +-
src/pyudev/_util.py | 17 +-
src/pyudev/core.py | 18 +-
src/pyudev/device/__init__.py | 12 -
src/pyudev/device/_device.py | 164 +++++++-
src/pyudev/discover.py | 19 +-
src/pyudev/glib.py | 6 +-
src/pyudev/monitor.py | 10 +-
src/pyudev/version.py | 2 +-
tests/_constants.py | 77 +++-
tests/_device_tests/_attributes_tests.py | 45 +-
tests/_device_tests/_device_tests.py | 86 ++--
tests/_device_tests/_devices_tests.py | 2 +-
tests/_device_tests/_tags_tests.py | 25 +-
tests/conftest.py | 2 -
tests/plugins/fake_monitor.py | 1 -
tests/test_core.py | 1 -
tests/test_discover.py | 4 +-
tests/test_enumerate.py | 609 +++++++++++++++++++---------
tests/test_libudev.py | 172 --------
tests/test_monitor.py | 9 +-
tests/test_observer.py | 11 +-
tests/test_observer_deprecated.py | 6 +-
tests/test_parsing.py | 143 -------
tests/test_pypi.py | 4 +-
tests/test_util.py | 16 +-
tests/utils/__init__.py | 2 +-
tests/utils/journal.py | 55 ---
tests/utils/libudev.py | 186 ---------
tests/utils/misc.py | 31 ++
tests/utils/udev.py | 101 ++---
tox.ini | 4 +-
61 files changed, 1196 insertions(+), 2182 deletions(-)
diff --cc debian/.git-dpm
index 07f25de,0000000..fc2dd42
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 282c3b14abff89a6a90b812572baed088b6d47a8
- 282c3b14abff89a6a90b812572baed088b6d47a8
- bac06affebd2eb0a37ea9a8d6a4b357d5c9772b7
++fbaba6ec50aa882f960eea324a6d842afe38b8bd
++fbaba6ec50aa882f960eea324a6d842afe38b8bd
++ae5c381863dec12ad8f7df18f337dd8b06eaf6a2
+ae5c381863dec12ad8f7df18f337dd8b06eaf6a2
+pyudev_0.21.0.orig.tar.gz
+58263b4358951d3a990bce7661e2e2ff30ca6cbe
+89469
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/libudev_loading.diff
index e6fe30c,0000000..3b4b43c
mode 100644,000000..100644
--- a/debian/patches/libudev_loading.diff
+++ b/debian/patches/libudev_loading.diff
@@@ -1,29 -1,0 +1,43 @@@
- From 282c3b14abff89a6a90b812572baed088b6d47a8 Mon Sep 17 00:00:00 2001
++From fbaba6ec50aa882f960eea324a6d842afe38b8bd Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 13:29:41 -0700
+Subject: Hardcode the libudev SONAME that the package depends on.
+
+ This makes sure that we don't load an untested ABI.
+Bu-Debian: https://bugs.debian.org/722573
+
+Patch-Name: libudev_loading.diff
+---
- src/pyudev/_ctypeslib/libudev.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
++ src/pyudev/_ctypeslib/utils.py | 5 ++++-
++ src/pyudev/core.py | 2 +-
++ 2 files changed, 5 insertions(+), 2 deletions(-)
+
- diff --git a/src/pyudev/_ctypeslib/libudev.py b/src/pyudev/_ctypeslib/libudev.py
- index 7536c9e..e757307 100644
- --- a/src/pyudev/_ctypeslib/libudev.py
- +++ b/src/pyudev/_ctypeslib/libudev.py
- @@ -279,10 +279,7 @@ def load_udev_library():
-
- Raise :exc:`~exceptions.ImportError`, if the udev library was not found.
++diff --git a/src/pyudev/_ctypeslib/utils.py b/src/pyudev/_ctypeslib/utils.py
++index d10b6c9..6efd18e 100644
++--- a/src/pyudev/_ctypeslib/utils.py
+++++ b/src/pyudev/_ctypeslib/utils.py
++@@ -51,7 +51,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:
- - raise ImportError('No library named udev')
- - libudev = CDLL(udev_library_name, use_errno=True)
- + libudev = CDLL('libudev.so.1', use_errno=True)
- # context function signature
- for namespace, members in SIGNATURES.items():
- for funcname in members:
++- library_name = find_library(name)
+++ if if ".so" in name:
+++ library_name = name
+++ else:
+++ library_name = find_library(name)
++ if not library_name:
++ raise ImportError('No library named %s' % name)
++ lib = CDLL(library_name, use_errno=True)
++diff --git a/src/pyudev/core.py b/src/pyudev/core.py
++index de6f245..0e44ca2 100644
++--- a/src/pyudev/core.py
+++++ b/src/pyudev/core.py
++@@ -61,7 +61,7 @@ class Context(object):
++ """
++ Create a new context.
++ """
++- self._libudev = load_ctypes_library('udev', SIGNATURES, ERROR_CHECKERS)
+++ self._libudev = load_ctypes_library('libudev.so.1', SIGNATURES, ERROR_CHECKERS)
++ self._as_parameter_ = self._libudev.udev_new()
++
++ def __del__(self):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyudev.git
More information about the Python-modules-commits
mailing list