[Python-modules-commits] [pyudev] 05/08: merge patched into master
Felix Geyer
fgeyer at moszumanska.debian.org
Tue Apr 26 19:26:19 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 0b09929284ffe9b15258e9503c4437772b2c436f
Merge: 879e355 282c3b1
Author: Felix Geyer <fgeyer at debian.org>
Date: Tue Apr 26 20:46:40 2016 +0200
merge patched into master
.../pbr/tests/testpackage/test-requirements.txt | 1 +
.../pbr/tests/testpackage/test-requirements.txt | 1 +
CHANGES.rst | 58 +-
MANIFEST.in | 4 +-
PKG-INFO | 13 +-
README.rst | 11 +-
build_bindings.py | 406 ----------
debian/.git-dpm | 6 +-
debian/patches/libudev_loading.diff | 14 +-
doc/_templates/info.html | 2 -
doc/api/index.rst | 1 +
doc/api/pyudev.glib.rst | 34 +-
doc/api/pyudev.pyqt4.rst | 36 +-
doc/api/pyudev.pyqt5.rst | 37 +
doc/api/pyudev.pyside.rst | 36 +-
doc/api/pyudev.rst | 23 +
doc/api/pyudev.wx.rst | 73 +-
doc/conf.py | 19 +-
doc/endorsements.rst | 11 +
doc/guide.rst | 30 +-
doc/index.rst | 25 +-
doc/tests/plugins.rst | 195 +----
doc/tests/running.rst | 66 +-
pyudev.egg-info/SOURCES.txt | 57 --
pyudev/_qt_base.py | 76 --
pyudev/pyqt4.py | 87 ---
pyudev/pyside.py | 88 ---
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 ++
requirements.txt | 5 +-
setup.py | 21 +-
{pyudev.egg-info => src/pyudev.egg-info}/PKG-INFO | 13 +-
src/pyudev.egg-info/SOURCES.txt | 99 +++
.../pyudev.egg-info}/dependency_links.txt | 0
src/pyudev.egg-info/requires.txt | 1 +
.../pyudev.egg-info}/top_level.txt | 0
{pyudev => src/pyudev}/__init__.py | 5 +-
{pyudev => src/pyudev}/_compat.py | 0
.../pyudev/_ctypeslib/__init__.py | 30 +-
src/pyudev/_ctypeslib/_errorcheckers.py | 106 +++
src/pyudev/_ctypeslib/libc.py | 73 ++
.../pyudev/_ctypeslib/libudev.py | 191 ++---
pyudev/_compat.py => src/pyudev/_os/__init__.py | 30 +-
src/pyudev/_os/pipe.py | 157 ++++
src/pyudev/_os/poll.py | 119 +++
.../_compat.py => src/pyudev/_parsing/__init__.py | 35 +-
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 | 207 ++++++
{pyudev => src/pyudev}/_util.py | 81 +-
{pyudev => src/pyudev}/core.py | 119 ++-
pyudev/_compat.py => src/pyudev/device/__init__.py | 49 +-
pyudev/device.py => src/pyudev/device/_device.py | 821 +++++++++++----------
src/pyudev/device/_errors.py | 187 +++++
src/pyudev/discover.py | 397 ++++++++++
{pyudev => src/pyudev}/glib.py | 136 ++--
{pyudev => src/pyudev}/monitor.py | 137 ++--
src/pyudev/pyqt4.py | 64 ++
src/pyudev/pyqt5.py | 49 ++
src/pyudev/pyside.py | 63 ++
pyudev/_compat.py => src/pyudev/version.py | 31 +-
{pyudev => src/pyudev}/wx.py | 78 +-
tests/__init__.py | 0
tests/_constants.py | 64 ++
.../_compat.py => tests/_device_tests/__init__.py | 29 +-
tests/_device_tests/_attributes_tests.py | 158 ++++
tests/_device_tests/_device_tests.py | 481 ++++++++++++
tests/_device_tests/_devices_tests.py | 243 ++++++
tests/_device_tests/_tags_tests.py | 101 +++
tests/conftest.py | 55 +-
tests/plugins/fake_monitor.py | 5 +-
tests/plugins/mock_libudev.py | 41 +-
pyudev/_compat.py => tests/plugins/travis.py | 43 +-
tests/test_core.py | 34 +-
tests/test_device.py | 612 ++-------------
tests/test_discover.py | 203 +++++
tests/test_enumerate.py | 124 +++-
tests/test_libudev.py | 76 +-
tests/test_monitor.py | 170 +++--
tests/test_observer.py | 125 +---
...est_observer.py => test_observer_deprecated.py} | 57 +-
tests/test_parsing.py | 143 ++++
tests/test_pypi.py | 119 ++-
tests/test_util.py | 85 ++-
pyudev/_compat.py => tests/utils/__init__.py | 30 +-
tests/utils/journal.py | 55 ++
tests/{plugins => utils}/libudev.py | 44 +-
pyudev/_compat.py => tests/utils/misc.py | 32 +-
tests/{plugins/udev_database.py => utils/udev.py} | 165 +++--
tox.ini | 21 +-
98 files changed, 5921 insertions(+), 2931 deletions(-)
diff --cc debian/.git-dpm
index e5df264,0000000..4247b74
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
- f384c83e14bbd057466e3d199da332d954122132
- f384c83e14bbd057466e3d199da332d954122132
- f09ce97048f1af48f59588cc928a8dbf6159e422
++282c3b14abff89a6a90b812572baed088b6d47a8
++282c3b14abff89a6a90b812572baed088b6d47a8
++bac06affebd2eb0a37ea9a8d6a4b357d5c9772b7
+bac06affebd2eb0a37ea9a8d6a4b357d5c9772b7
+pyudev_0.19.0.orig.tar.gz
+2090aed9bdf9dd50d3c4a8d9449cfabac604a5ba
+96556
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/libudev_loading.diff
index db4e16c,0000000..e6fe30c
mode 100644,000000..100644
--- a/debian/patches/libudev_loading.diff
+++ b/debian/patches/libudev_loading.diff
@@@ -1,29 -1,0 +1,29 @@@
- From f384c83e14bbd057466e3d199da332d954122132 Mon Sep 17 00:00:00 2001
++From 282c3b14abff89a6a90b812572baed088b6d47a8 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
+---
- pyudev/_libudev.py | 5 +----
++ src/pyudev/_ctypeslib/libudev.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
- diff --git a/pyudev/_libudev.py b/pyudev/_libudev.py
- index f469727..6778c46 100644
- --- a/pyudev/_libudev.py
- +++ b/pyudev/_libudev.py
- @@ -267,10 +267,7 @@ def load_udev_library():
++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.
+ """
+- 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:
--
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