summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2023-05-26 19:10:49 +0300
committerPatrick Williams <patrick@stwcx.xyz>2023-06-09 07:48:34 +0300
commite760df85eded3ead9d756555d5144acc5e3d3fa1 (patch)
tree38743ac80acd51ffc6802f09c6d44f80ea26a55f /meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus
parentd5681c52378ddefb08060e8612c8fbd61f726301 (diff)
downloadopenbmc-e760df85eded3ead9d756555d5144acc5e3d3fa1.tar.xz
subtree updates
meta-security: ddf301c45c..5c2379f4bc: Armin Kuster (2): samhain: Update to 4.4.10 layer.conf: Insert addpylib declaration John Edward Broadbent (1): libhoth_git.bb:SRCREV bump 1622e8a04..d769296220d meta-openembedded: 0474e0b870..829dcb63f0: Alexander Stein (2): libcamera: Allow overwriting default pipelines and IPA libcamera: Simplify pipeline configuration Christophe Vu-Brugier (1): exfatprogs: upgrade 1.2.0 -> 1.2.1 Denys Zagorui (2): bpftool: Fix externalsrc support bpftool: return do_configure dependency Joe Slater (2): bats: use baselib libgpiod: modify test 'gpioset: toggle (continuous)' Johannes Kauffmann (2): open62541: rename encryption PACKAGECONFIG open62541: add OpenSSL as crypto provider Khem Raj (52): gerbera: Fix build with fmt 10+ mpd: Fix build with clang-16 ptest-packagelists-meta-oe: Remove nodejs ptests for rv32/rv64 libpeas: Fix reference to TMPDIR in tests lirc: Define SH_PATH=/bin/sh libwebsockets: Fix reference to TMPDIR mce-inject: Pass CFLAGS to make mcelog: Upgrade to 194 xrdb: Pass target CPP location to configure mce-test: Update to latest mce-test: Pass CFLAGS to make ippool: Port to using ppp 2.5.x ippool: Enable systemd service on install libtraceevent: Delete meta-oe-ptests: Add mcelog to PTESTS_FAST_META_OE ptest-packagelists-meta-python: Add python3-pylint to PTESTS_FAST_META_PYTHON oscam: Upgrade to 11718 oscam: Fix buildpaths in generated sources lockfile-progs: Pass DEBUG_PREFIX_MAP options tvheadend: Upgrade to latest master nbdkit: Remove buildpaths from binaries system-config-printer: Delete __pycache__ files dovecot: Upgrade to 2.3.20 dovecot: Do not install dovecot-config mpv: Remove references to builddir from mpv binary libnice: Remove buildpaths from binaries curlpp: Remove references to buildpaths e.g. TMPDIR unbound: Remove references to buildpaths fftw: Check for TOOLCHAIN_OPTIONS to be non-empty before sed ops aom: Upgrade to 3.6.1 aom: Pass nasm flags via toochain.cmake uml-utilities: Fix references to TMPDIR openct: Fix buildpaths being emitted into generated types.h babeld: Upgrade to 1.12.2 nautilus: Fix buildpath QA errors minifi-cpp: Remove references to buildpaths in generated files freerdp: Fix reference to TMPDIR in libfreerdp2.so vlc: Remove WORKDIR from CONFIGURE_LINE definition system-config-printer: Check for gobject-introspection as well in distro features packagegroup-xfce-extended: Blueman also needs gobject introspection distro feature remmina: Fix buildpaths QA warnings cgdb: Fix buildpaths emitted into cgdb binary ibus: Point python interpreter to target location eog: Fix absolute src paths in generated files gimp: Fix buildpaths in binaries and scripts libgphoto2: Edit out sysroot from CC variable in configure tracker: Point TOP_SRCDIR to target path vlan: Pass CFLAGS via CCFLAGS sgpio: Pass CFLAGS to make x265: Pass --debug-prefix-map to nasm ipmiutil: Upgrade to 3.1.9 ipmiutil: Pass --enable-useflags Marek Vasut (1): lvgl: lvgl-demo-fb: Switch to CMake and add DRM and SDL support Markus Volk (7): evince: edit include path for debug package pipewire: update 0.3.70 -> 0.3.71 dav1d: update 1.1.0 -> 1.2.0 gnome-control-center: update 43.2 -> 44.1 mutter: update 43.1 -> 44.1 gnome-shell: update 43.2 -> 44.1 fluidsynth: update 2.2.6 -> 2.3.2 Martin Jansa (20): libsquish: remove unused 0001-makefile-Add-LIBDIR.patch meta-python: remove unused patches from python2 recipes python3-pybind11: remove unused 0001-Do-not-strip-binaries.patch python3-anyjson: remove unused files monkey: remove unused patch file gnome-terminal: remove unused patch file geary: remove unused patch files ndpi: remove unused CVE-2021-36082.patch soci: remove unused soci_libdir.patch cyrus-sasl: remove unused patch file plymouth: remove unused patch file glibmm: remove unused remove-examples.patch opencv: remove unused patch file libiio: remove unused patch file libinih: remove unused patch file beep: remove unused linux-input.patch paho-mqtt-c: remove unused patch file tigervnc: remove unused patch file fbida: remove unused use-jpeg-turbo.patch graphviz: remove unused patch files Martin Siegumfeldt (1): libiio: update to version 0.24 Mingli Yu (1): php: Link with libatomic on rv64 Peter Bergin (6): redis-plus-plus: clean up recipe and make use of packageconfig redis-plus-plus: introduce fix for library detection redis-plus-plus: uprev to 1.3.8 hiredis: uprev to 1.1.0 hiredis: change dependency to redis hiredis: add ptest Ross Burton (38): libblockdev: add PACKAGECONFIG for tools libblockdev: clean up DEPENDS glade: add autoconf-archive-native DEPENDS python3-kivy: depend on gobject-introspection-data DISTRO_FEATURE vte9: add missing dependency on glib-2.0-native libgxim: add autoconf-archive-native DEPENDS gnome-common: add autoconf-archive RDEPENDS graphviz: no longer needs intltool-native libpeas: depend on gobject-introspection-data system-config-printer: clean up DEPENDS imsettings: add missing DEPENDS on autoconf-archive-native python3-pyatspi: make dependent on gobject-introspection-data being enabled gnome-menu: remove redundant dependencies hplip: build against libusb1 hplip: remove redundant FILES:${PN}-dbg gutenprint: rewrite recipe and update gutenprint: match ownership on /etc/cups python3-pydbus-manager: remove obsolete recipe python3-pydbus: remove obsolete recipe firewalld: add features_check on gobject-introspection-data blueman: add features_check on gobject-introspection-data networkd-dispatcher: add features_check on gobject-introspection-data python3-asyncio-glib: add features_check on gobject-introspection-data eog: requires gobject-introspection-data DISTRO_FEATURE grilo-plugins: add PACKAGECONFIG for tracker packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled libpeas: requires gobject-introspection-data DISTRO_FEATURE gnome-desktop: gobject-introspection is not in fact mandatory gnome-photos: requires gobject-introspection-data DISTRO_FEATURE geoclue: the library doesn't need gobject-introspection nautilus: requires gobject-introspection-data DISTRO_FEATURE packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled python3-blivetgui: requires gobject-introspection-data DISTRO_FEATURE xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor catfish: requires gobject-introspection-data DISTRO_FEATURE menulibre: requires gobject-introspection-data DISTRO_FEATURE xfce4-panel-profiles: requires gobject-introspection-data DISTRO_FEATURE networkmanager: add dependency on pyhthon3-pygobject-native Sanjay Chitroda (1): gnulib: Update recipe name to 2018-12-18 Thomas Perrot (1): networkmanager: Turn ppp support into a packageconfig option Wang Mingyu (43): fmt: upgrade 9.1.0 -> 10.0.0 spdlog: fix build error for master fmt mpd: fix build error when fmt updated gensio: upgrade 2.6.4 -> 2.6.5 ctags: upgrade 6.0.20230507.0 -> 6.0.20230521.0 libirecovery: upgrade 1.0.1 -> 1.1.0 hidapi: upgrade 0.13.1 -> 0.14.0 double-conversion: upgrade 3.2.1 -> 3.3.0 adw-gtk3: upgrade 4.6 -> 4.7 gnome-terminal: upgrade 3.48.0 -> 3.48.1 grilo: upgrade 0.3.15 -> 0.3.16 lldpd: upgrade 1.0.16 -> 1.0.17 f2fs-tools: upgrade 1.15.0 -> 1.16.0 dbus-cxx: upgrade 2.3.1 -> 2.4.0 mailcap: upgrade 2.1.53 -> 2.1.54 c-ares: upgrade 1.19.0 -> 1.19.1 fetchmail: upgrade 6.4.23 -> 6.4.37 python3-flask-restful: upgrade 0.3.9 -> 0.3.10 python3-dominate: upgrade 2.7.0 -> 2.8.0 python3-antlr4-runtime: upgrade 4.12.0 -> 4.13.0 python3-coverage: upgrade 7.2.5 -> 7.2.6 python3-imageio: upgrade 2.28.1 -> 2.29.0 ostree: upgrade 2023.2 -> 2023.3 python3-asgiref: upgrade 3.6.0 -> 3.7.1 python3-can: upgrade 4.2.0 -> 4.2.1 python3-u-msgpack-python: upgrade 2.7.2 -> 2.8.0 python3-astroid: upgrade 2.15.4 -> 2.15.5 python3-protobuf: upgrade 4.23.0 -> 4.23.1 python3-pulsectl: upgrade 23.5.1 -> 23.5.2 python3-django: upgrade 4.1.7 -> 4.2.1 python3-google-auth: upgrade 2.18.0 -> 2.18.1 python3-pytest-xdist: upgrade 3.3.0 -> 3.3.1 python3-sqlalchemy: upgrade 2.0.13 -> 2.0.15 python3-xlsxwriter: upgrade 3.1.0 -> 3.1.1 python3-websocket-client: upgrade 1.5.1 -> 1.5.2 zchunk: upgrade 1.3.0 -> 1.3.1 python3-stevedore: upgrade 5.0.0 -> 5.1.0 python3-sentry-sdk: upgrade 1.22.2 -> 1.24.0 rdma-core: upgrade 45.0 -> 46.0 valijson: upgrade 1.0 -> 1.0.1 python3-tzlocal: upgrade 4.3 -> 5.0.1 python3-xmlschema: upgrade 2.2.3 -> 2.3.0 setxkbmap: upgrade 1.3.3 -> 1.3.4 Xiangyu Chen (2): Revert "pahole: fix native package build error" libbpf: installing uapi headers for native package Zhang Xiao (1): dhcp-relay: dev subpackage conflicts with bind-dev richardhb (1): python3-bleak: add recipe ricoheller (3): python3-dbus-fast: add recipe python3-aioredis: add recipe mbpoll: add recipe poky: 35e5d29a7d..76494f2b66: Alexander Kanavin (23): glib-2.0: upgrade 2.74.6 -> 2.76.2 ppp: upgrade 2.4.9 -> 2.5.0 ovmf: update 202211 -> 202302 btrfs-tools: update 6.1.3 -> 6.3 erofs-utils: update 1.5 -> 1.6 llvm: update 15.0.7 -> 16.0.3 perlcross: update 1.4 -> 1.4.1 perl: update 5.36.0 -> 5.36.1 rpm: update 4.18.0 -> 4.18.1 less: update 608 -> 633 librsvf: update 2.54.5 -> 2.56.0 libva: update 2.16 -> 2.18 cryptodev: remove unneeded patch gpgme: update 1.18.0 -> 1.20.0 libatomic-ops: update 7.6.14 -> 7.8.0 libgcrypt: update 1.10.1 -> 1.10.2 libgpg-error: update 1.46 -> 1.47 createrepo-c: update 0.20.1 -> 0.21.1 elfutils: update 0.188 -> 0.189 meson: update 1.0.1 ->1.1.0 gdb: trim python support RDEPENDS gdb: enable python PACKAGECONFIG valgrind: update 3.20.0 -> 3.21.0 Antonin Godard (1): archiver: move exclusion logic in a dedicated function Anuj Mittal (4): gsettings-desktop-schemas: upgrade 43.0 -> 44.0 harfbuzz: upgrade 7.1.0 -> 7.3.0 libevdev: upgrade 1.13.0 -> 1.13.1 libsoup: upgrade 3.4.0 -> 3.4.2 Arno Baumfalk (1): bitbake: fetch2/npm: evaluate PATH before patching HOME Bartosz Golaszewski (17): python3-attrs: unify RDEPENDS python3-attrs: don't use PYTHON_PN python3-attrs: add missing run-time dependencies python3-certifi: add missing run-time dependencies python3-hypothesis: fix run-time dependencies python3-tomli: add missing run-time dependencies python3-pathspec: add missing run-time dependencies python3-installer: add missing run-time dependencies python3-sphinx-rtd-theme: add missing run-time dependencies python3-setuptools-rust: fix RDEPENDS and allow target build python3-pyproject-hooks: add missing run-time dependencies python3-pycryptodome: don't use PYTHON_PN python3-pycryptodome: add missing run-time dependencies python3-pygobject: add missing run-time dependencies python3-manifest: cgitb: new package python3-manifest: zipapp: new package python3-manifest: turtle: new package Bergin, Peter (1): bitbake: lib/bb/tests/fetch.py: set initial branch Chen Qi (2): oe-buildenv-internal: remove path from previous project staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot Chi Xu (1): expect: Add ptest support Deepthi Hemraj (1): binutils: stable 2.40 branch updates Denys Dmytriyenko (2): grep: upgrade 3.10 -> 3.11 xz: upgrade 5.4.2 -> 5.4.3 Eero Aaltonen (1): avahi: fix D-Bus introspection Frieder Schrempf (1): psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox Geoff Parker (1): libwebp: add BBCLASSEXTEND Kai Kang (1): pm-utils: fix multilib conflictions Khem Raj (8): llvm: Enable RISCV support llvm,mesa: Drop MESA_LLVM_RELEASE systemd: Drop a backport go: Upgrade 1.20.1 -> 1.20.4 go: Use -no-pie to build target cgo gcc: Upgrade to GCC 13.1 release bitbake.conf: Add -fcanon-prefix-map to DEBUG_PREFIX_MAP perf: Fix build with gcc-13 Leon Anavi (1): wic: Add argument --hidden to default imager Lorenzo Arena (1): conf: add nice level to the hash config ignred variables Martin Jansa (11): kernel-devicetree: make shell scripts posix compliant go.bbclass: don't use test to check output from ls image-live.bbclass: respect IMAGE_MACHINE_SUFFIX binutils: package static libs from gprofng rpm: drop unused 0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch libx11: remove unused patch and FILESEXTRAPATHS qemu: remove unused qemu-7.0.0-glibc-2.36.patch minicom: remove unused patch files inetutils: remove unused patch files libgloss: remove unused patch file kmod: remove unused ptest.patch Max Krummenacher (4): libtraceevent: import from meta-openembedded libtraceevent: fix qa issue reference to tmpdir perf: make pkg-config available perf: add libtraceevent packageconfig Mikko Rapeli (3): qemurunner: support serial console login via qemu stdout qemurunner: avoid leaking server_socket qemurunner: add boot logs to do_testimage task logs in real time Pavel Zhukov (1): lib/terminal.py: Add urxvt terminal Peter Kjellerstedt (5): glib-2.0: Avoid having g_futex_simple() inadvertently modify errno musl: Correct SRC_URI xf86-video-intel: Use the HTTPS protocol to fetch the Git repositories bitbake: fetch2/crate: Simplify extraction of crate names and versions from URIs bitbake: fetch2/crate: Correct unpack for a crate that matches the recipe name Qiu Tingting (1): e2fsprogs: Fix error SRCDIR when using usrmerge DISTRO_FEATURES Randolph Sapp (2): package: enable recursion on file globs kernel-devicetree: recursively search for dtbs Randy MacLeod (1): vim: upgrade 9.0.1429 -> 9.0.1527 Ranjitsinh Rathod (1): kmscube: Correct DEPENDS to avoid overwrite Richard Purdie (9): bitbake: cooker: Fix/improve collections handling bitbake: fetch2: Clarify different localpaths functions bitbake: fetch2/local: Add debug to include chosen path bitbake.conf: Empty SRC_URI for code parser cache handling bitbake: cooker: Add FILE_LAYERNAME variable containing the layername for a recipe linux-yocto: Drop 5.15 support lttng-tools: Add patch to fix gcc 13 test issue glib-2.0: Fix TMPDIR mismatch test failures linux-yocto: Drop 5.15 support Robert Joslyn (1): curl: Update from 8.0.1 to 8.1.0 Ross Burton (23): cpio: upgrade to 2.14 gnutls: add PACKAGECONFIG for DANE gnutls: add PACKAGECONFIG options for certification compression gnutls: use system libtasn1 gnutls: clean up ptest compilation gnutls: remove use of argp-standalone for musl glib-networking: fix LICENSE statement glib-networking: add gnomeproxy PACKAGECONFIG glib-networking add environment variable proxy PACKAGECONFIG qemu: add PACKAGECONFIG for debuginfo support meta: depend on autoconf-archive-native, not autoconf-archive gobject-introspection: always DEPEND on gobject-introspection-native python3-pygobject: remove explicit gobject-introspection DEPENDS gconf: remove explicit gobject-introspection DEPENDS gi-docgen.bbclass: depends on gobject-introspection-data being enabled python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE gstreamer1.0-python: mandate gobject-introspection-data DISTRO_FEATURE python3-gitdb: remove python3-async dependency python3-async: remove recipe libcheck: add ghetto automake output libnl: clean up ptest libcomps: clean up DEPENDS gdbm: improve run-ptest Sudip Mukherjee (2): dhcpcd: upgrade to v10.0.1 libxi: upgrade to v1.8.1 Thomas Roos (2): oeqa: adding selftest-hello and use it to speed up tests oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo Tom Hochstein (1): piglit: Add missing glslang dependencies Trevor Gamblin (2): python3-hatchling: upgrade 1.14.1 -> 1.17.0 python3-trove-classifiers: upgrade 2023.4.29 -> 2023.5.2 Wang Mingyu (1): iso-codes: upgrade 4.13.0 -> 4.15.0 meta-raspberrypi: 928bb234bb..9240ea91ca: Zachary T Welch (1): machines: simplify MACHINEOVERRIDES definitions meta-arm: f9d80e1a14..5cbe3041be: Clément Péron (5): arm/lib: pass the PATH to fvp runner scripts/runfvp: Fix KeyError exception when there is no FVP_CONSOLE provided runfvp: make fvp runner to hold the config fvp: runner: execute fvp process in the same working directory as fvpconf runfvp: update filepath in fvpconf to relative path Jon Mason (2): arm-bsp/tc1: use latest kernel and u-boot arm-bsp/tc1: re-enable signed kernel image Ross Burton (2): arm/lib/fvp: remove redundant trailing commas arm-bsp/fvp-base: remove u-boot version pinning Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: If7df9ee24ecd0b574eeb9ca799dd15d915d4ec42
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus')
-rw-r--r--meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch93
-rw-r--r--meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch203
2 files changed, 0 insertions, 296 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch
deleted file mode 100644
index eb97f05850..0000000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0001-Support-asynchronous-calls-58.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 39a7d79ee6c548902fbac8b95c934af7e4c69260 Mon Sep 17 00:00:00 2001
-From: Vendula Poncova <vponcova@redhat.com>
-Date: Thu, 2 Aug 2018 15:30:45 +0800
-Subject: [PATCH 1/2] Support asynchronous calls (#58)
-
-Added support for asynchronous calls of methods. A method is called
-synchronously unless its callback parameter is specified. A callback
-is a function f(*args, returned=None, error=None), where args is
-callback_args specified in the method call, returned is a return
-value of the method and error is an exception raised by the method.
-
-Example of an asynchronous call:
-
-def func(x, y, returned=None, error=None):
- pass
-
-proxy.Method(a, b, callback=func, callback_args=(x, y))
-
-Upstream-Status: Backport [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- pydbus/proxy_method.py | 44 ++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 38 insertions(+), 6 deletions(-)
-
-diff --git a/pydbus/proxy_method.py b/pydbus/proxy_method.py
-index 8798edd..4ea4304 100644
---- a/pydbus/proxy_method.py
-+++ b/pydbus/proxy_method.py
-@@ -65,15 +65,34 @@ class ProxyMethod(object):
-
- # Python 2 sux
- for kwarg in kwargs:
-- if kwarg not in ("timeout",):
-+ if kwarg not in ("timeout", "callback", "callback_args"):
- raise TypeError(self.__qualname__ + " got an unexpected keyword argument '{}'".format(kwarg))
- timeout = kwargs.get("timeout", None)
-+ callback = kwargs.get("callback", None)
-+ callback_args = kwargs.get("callback_args", tuple())
-+
-+ call_args = (
-+ instance._bus_name,
-+ instance._path,
-+ self._iface_name,
-+ self.__name__,
-+ GLib.Variant(self._sinargs, args),
-+ GLib.VariantType.new(self._soutargs),
-+ 0,
-+ timeout_to_glib(timeout),
-+ None
-+ )
-+
-+ if callback:
-+ call_args += (self._finish_async_call, (callback, callback_args))
-+ instance._bus.con.call(*call_args)
-+ return None
-+ else:
-+ ret = instance._bus.con.call_sync(*call_args)
-+ return self._unpack_return(ret)
-
-- ret = instance._bus.con.call_sync(
-- instance._bus_name, instance._path,
-- self._iface_name, self.__name__, GLib.Variant(self._sinargs, args), GLib.VariantType.new(self._soutargs),
-- 0, timeout_to_glib(timeout), None).unpack()
--
-+ def _unpack_return(self, values):
-+ ret = values.unpack()
- if len(self._outargs) == 0:
- return None
- elif len(self._outargs) == 1:
-@@ -81,6 +100,19 @@ class ProxyMethod(object):
- else:
- return ret
-
-+ def _finish_async_call(self, source, result, user_data):
-+ error = None
-+ return_args = None
-+
-+ try:
-+ ret = source.call_finish(result)
-+ return_args = self._unpack_return(ret)
-+ except Exception as err:
-+ error = err
-+
-+ callback, callback_args = user_data
-+ callback(*callback_args, returned=return_args, error=error)
-+
- def __get__(self, instance, owner):
- if instance is None:
- return self
---
-2.7.4
-
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch
deleted file mode 100644
index 9c9b9b779b..0000000000
--- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus/0002-Support-transformation-between-D-Bus-errors-and-exce.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 69968dec867053e38de0b91d76ac41d5a5735e36 Mon Sep 17 00:00:00 2001
-From: Vendula Poncova <vponcova@redhat.com>
-Date: Thu, 2 Aug 2018 15:31:56 +0800
-Subject: [PATCH 2/2] Support transformation between D-Bus errors and
- exceptions.
-
-Exceptions can be registered with decorators, raised in a remote
-method and recreated after return from the remote call.
-
-Upstream-Status: Backport [https://src.fedoraproject.org/cgit/rpms/python-pydbus.git/]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- pydbus/error.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++
- pydbus/proxy_method.py | 18 ++++++++--
- pydbus/registration.py | 16 ++++++---
- 3 files changed, 123 insertions(+), 8 deletions(-)
- create mode 100644 pydbus/error.py
-
-diff --git a/pydbus/error.py b/pydbus/error.py
-new file mode 100644
-index 0000000..aaa3510
---- /dev/null
-+++ b/pydbus/error.py
-@@ -0,0 +1,97 @@
-+from gi.repository import GLib, Gio
-+
-+
-+def register_error(name, domain, code):
-+ """Register and map decorated exception class to a DBus error."""
-+ def decorated(cls):
-+ error_registration.register_error(cls, name, domain, code)
-+ return cls
-+
-+ return decorated
-+
-+
-+def map_error(error_name):
-+ """Map decorated exception class to a DBus error."""
-+ def decorated(cls):
-+ error_registration.map_error(cls, error_name)
-+ return cls
-+
-+ return decorated
-+
-+
-+def map_by_default(cls):
-+ """Map decorated exception class to all unknown DBus errors."""
-+ error_registration.map_by_default(cls)
-+ return cls
-+
-+
-+class ErrorRegistration(object):
-+ """Class for mapping exceptions to DBus errors."""
-+
-+ _default = None
-+ _map = dict()
-+ _reversed_map = dict()
-+
-+ def map_by_default(self, exception_cls):
-+ """Set the exception class as a default."""
-+ self._default = exception_cls
-+
-+ def map_error(self, exception_cls, name):
-+ """Map the exception class to a DBus name."""
-+ self._map[name] = exception_cls
-+ self._reversed_map[exception_cls] = name
-+
-+ def register_error(self, exception_cls, name, domain, code):
-+ """Map and register the exception class to a DBus name."""
-+ self.map_error(exception_cls, name)
-+ return Gio.DBusError.register_error(domain, code, name)
-+
-+ def is_registered_exception(self, obj):
-+ """Is the exception registered?"""
-+ return obj.__class__ in self._reversed_map
-+
-+ def get_dbus_name(self, obj):
-+ """Get the DBus name of the exception."""
-+ return self._reversed_map.get(obj.__class__)
-+
-+ def get_exception_class(self, name):
-+ """Get the exception class mapped to the DBus name."""
-+ return self._map.get(name, self._default)
-+
-+ def transform_message(self, name, message):
-+ """Transform the message of the exception."""
-+ prefix = "{}:{}: ".format("GDBus.Error", name)
-+
-+ if message.startswith(prefix):
-+ return message[len(prefix):]
-+
-+ return message
-+
-+ def transform_exception(self, e):
-+ """Transform the remote error to the exception."""
-+ if not isinstance(e, GLib.Error):
-+ return e
-+
-+ if not Gio.DBusError.is_remote_error(e):
-+ return e
-+
-+ # Get DBus name of the error.
-+ name = Gio.DBusError.get_remote_error(e)
-+ # Get the exception class.
-+ exception_cls = self.get_exception_class(name)
-+
-+ # Return the original exception.
-+ if not exception_cls:
-+ return e
-+
-+ # Return new exception.
-+ message = self.transform_message(name, e.message)
-+ exception = exception_cls(message)
-+ exception.dbus_name = name
-+ exception.dbus_domain = e.domain
-+ exception.dbus_code = e.code
-+ return exception
-+
-+
-+# Default error registration.
-+error_registration = ErrorRegistration()
-diff --git a/pydbus/proxy_method.py b/pydbus/proxy_method.py
-index 4ea4304..e9496f5 100644
---- a/pydbus/proxy_method.py
-+++ b/pydbus/proxy_method.py
-@@ -2,6 +2,7 @@ from gi.repository import GLib
- from .generic import bound_method
- from .identifier import filter_identifier
- from .timeout import timeout_to_glib
-+from .error import error_registration
-
- try:
- from inspect import Signature, Parameter
-@@ -87,9 +88,20 @@ class ProxyMethod(object):
- call_args += (self._finish_async_call, (callback, callback_args))
- instance._bus.con.call(*call_args)
- return None
-+
- else:
-- ret = instance._bus.con.call_sync(*call_args)
-- return self._unpack_return(ret)
-+ result = None
-+ error = None
-+
-+ try:
-+ result = instance._bus.con.call_sync(*call_args)
-+ except Exception as e:
-+ error = error_registration.transform_exception(e)
-+
-+ if error:
-+ raise error
-+
-+ return self._unpack_return(result)
-
- def _unpack_return(self, values):
- ret = values.unpack()
-@@ -108,7 +120,7 @@ class ProxyMethod(object):
- ret = source.call_finish(result)
- return_args = self._unpack_return(ret)
- except Exception as err:
-- error = err
-+ error = error_registration.transform_exception(err)
-
- callback, callback_args = user_data
- callback(*callback_args, returned=return_args, error=error)
-diff --git a/pydbus/registration.py b/pydbus/registration.py
-index f531539..1d2cbcb 100644
---- a/pydbus/registration.py
-+++ b/pydbus/registration.py
-@@ -5,6 +5,7 @@ from . import generic
- from .exitable import ExitableWithAliases
- from functools import partial
- from .method_call_context import MethodCallContext
-+from .error import error_registration
- import logging
-
- try:
-@@ -91,11 +92,16 @@ class ObjectWrapper(ExitableWithAliases("unwrap")):
- logger = logging.getLogger(__name__)
- logger.exception("Exception while handling %s.%s()", interface_name, method_name)
-
-- #TODO Think of a better way to translate Python exception types to DBus error types.
-- e_type = type(e).__name__
-- if not "." in e_type:
-- e_type = "unknown." + e_type
-- invocation.return_dbus_error(e_type, str(e))
-+ if error_registration.is_registered_exception(e):
-+ name = error_registration.get_dbus_name(e)
-+ invocation.return_dbus_error(name, str(e))
-+ else:
-+ logger.info("name is not registered")
-+ e_type = type(e).__name__
-+ if not "." in e_type:
-+ e_type = "unknown." + e_type
-+
-+ invocation.return_dbus_error(e_type, str(e))
-
- def Get(self, interface_name, property_name):
- type = self.readable_properties[interface_name + "." + property_name]
---
-2.7.4
-