From 130fc8ff90c841c4acd1d89d35dbadbc98dc9f2a Mon Sep 17 00:00:00 2001 From: Packit Date: Sep 17 2020 19:40:04 +0000 Subject: dbus-python-1.2.4 base --- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9c47ba8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,78 @@ +# Copyright © 2016 Simon McVittie +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, copy, +# modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +sudo: required +dist: trusty +language: python +install: + - 'sudo apt-get -qq -y update' + - > + sudo apt-get -qq -y install + autoconf + automake + dbus + gnome-desktop-testing + libdbus-1-dev + libdbus-glib-1-dev + libtool + - > + test -z "$dbus_ci_system_python" || sudo apt-get -qq -y install + ${dbus_ci_system_python} + ${dbus_ci_system_python%-dbg}-docutils + ${dbus_ci_system_python%-dbg}-gi + - > + if test "$dbus_ci_system_python" = python; then + sudo apt-get -qq -y install python-epydoc python-gobject-2; + fi + - > + wget + http://httpredir.debian.org/debian/pool/main/a/autoconf-archive/autoconf-archive_20150925-1_all.deb + - 'sudo dpkg -i autoconf-archive_*_all.deb' + - 'rm autoconf-archive_*_all.deb' +python: + - "2.6" + - "2.7" + - "3.2" + - "3.3" + - "3.4" + - "3.5" + - "3.5-dev" + - "nightly" +script: + - ./tools/ci-build.sh + +matrix: + include: + - python: "2.7" + env: + dbus_ci_system_python=python + - python: "2.7" + env: + dbus_ci_system_python=python-dbg + - python: "3.4" + env: + dbus_ci_system_python=python3 + - python: "3.4" + env: + dbus_ci_system_python=python3-dbg + +# vim:set sw=2 sts=2 et: diff --git a/.version b/.version new file mode 100644 index 0000000..e8ea05d --- /dev/null +++ b/.version @@ -0,0 +1 @@ +1.2.4 diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..a5f1126 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,18 @@ +Olivier Andrieu +Philip Blundell +Anders Carlsson +Kristian Hogsberg +Alex Larsson +Robert McQueen +Simon McVittie +Michael Meeks +Osvaldo Santana Neto +Seth Nickell +John (J5) Palmieri +Havoc Pennington +Harri Porten +Matthew Rickard +Zack Rusin +Joe Shaw +Colin Walters +David Zeuthen diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..3180f9b --- /dev/null +++ b/COPYING @@ -0,0 +1,25 @@ +As of version 0.82.4, dbus-python is released under the following permissive +non-copyleft license (the same one that was proposed for D-Bus core but +wasn't achieved): + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Copyright holders and licensing are indicated in the source files. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..64d4424 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,10219 @@ +commit c0df2200a881b9c8fa4987cb3f7d281865536bfc +Author: Simon McVittie +Date: 2016-03-06 17:50:19 +0000 + + 1.2.4 + +M NEWS +M configure.ac + +commit 007ea1d228b849e192e3a471bb3c14292b897b0e +Author: Simon McVittie +Date: 2016-03-06 17:34:55 +0000 + + ci-build: test the setup.py glue as well as the Autotools build + + Signed-off-by: Simon McVittie + +M tools/ci-build.sh + +commit 602064459995b89d169d7e138691a96d4190b614 +Author: Simon McVittie +Date: 2016-03-06 17:37:46 +0000 + + Clean up test-service.log + + Signed-off-by: Simon McVittie + +M Makefile.am + +commit aba80c07c07cf8dd669dbfbe2aa51786425aa53f +Author: Simon McVittie +Date: 2016-03-06 17:20:23 +0000 + + NEWS so far + +M NEWS + +commit 9740e695a8e2276704f940a38c4067edbe8491f7 +Author: Simon McVittie +Date: 2016-03-06 17:08:03 +0000 + + Add Travis-CI metadata + + Signed-off-by: Simon McVittie + +A .travis.yml +M Makefile.am +A tools/ci-build.sh + +commit 7881666743df953227ccc403af4edfac7dd7ab8e +Author: Simon McVittie +Date: 2016-03-06 15:38:16 +0000 + + decorators: use a more modern idiom for signatures in Python >= 3.4 + + getargspec() isn't in Python 3.6 development versions. + + Signed-off-by: Simon McVittie + +M dbus/decorators.py + +commit 991c1f8de2f6396801736153173eb83dce0e9c15 +Author: Simon McVittie +Date: 2016-03-06 12:56:56 +0000 + + unicode test: cope with Python 2.6 as provided on travis-ci + + Python 2.6 didn't allow struct.pack(u'...', ...). + + Signed-off-by: Simon McVittie + +M test/test-standalone.py + +commit cf52ac6e8c92fe0a5577da8f9328b908967763bf +Author: Simon McVittie +Date: 2016-03-06 15:39:50 +0000 + + .gitignore: ignore autoconf-archive and pkg-config + + Signed-off-by: Simon McVittie + +M .gitignore + +commit 988c290f4a1bafdac6dabc499efb8b7ffa94a251 +Author: Simon McVittie +Date: 2016-03-05 23:57:46 +0000 + + run-test: avoid "test: =: unary operator expected" + + Signed-off-by: Simon McVittie + +M test/run-test.sh + +commit 506945f13c098f2b9abcccf681e64d6b924da3eb +Author: Simon McVittie +Date: 2016-03-05 23:49:51 +0000 + + Stop breaking a pre-existing PYTHONPATH in installed-tests' + environment + + ${PYTHONPATH} in Exec= isn't substituted by gnome-desktop-testing. + + If we rely on the fact that Python prepends the scripts' directory to + sys.path, then we don't need to alter PYTHONPATH at all. + + Signed-off-by: Simon McVittie + +M Makefile.am + +commit b6e1a0ce33969dc56fade2a5839848f4a926b8bb +Author: Simon McVittie +Date: 2016-03-05 23:20:49 +0000 + + Fix Unicode tests on narrow Python builds + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=57140 + Signed-off-by: Simon McVittie + +M test/test-standalone.py + +commit f1f4f1cd110a0a6bdd41ab8b3ae126c5ea455801 +Author: Simon McVittie +Date: 2016-03-05 21:16:31 +0000 + + Use the template GNOME autogen.sh + + Taken from: https://wiki.gnome.org/Projects/GnomeCommon/Migration + + This removes the non-standard --no-configure option, and replaces it + with NOCONFIGURE=1 as recommended in + . + + Signed-off-by: Simon McVittie + +M autogen.sh + +commit ed350ae4f4e43d0f5146c5891069829e89018322 +Author: Simon McVittie +Date: 2016-03-05 16:32:44 +0000 + + Add a regression test for the version numbering + + Now that dbus.__version__ and dbus.version exist even in uninstalled + builds, we can do this. + + Signed-off-by: Simon McVittie + +M test/test-standalone.py + +commit e119bf86c5a4a10ea4ed048df3a5d4a78fa15d5c +Author: Simon McVittie +Date: 2016-03-05 16:36:08 +0000 + + Get the version from the C code, not by generating a Python file + + This means we never try to import dbus/_version.py from the + ${builddir}, + which won't work. + + Signed-off-by: Simon McVittie + +M .gitignore +M Makefile.am +M configure.ac +M dbus/__init__.py +D dbus/_version.py.in + +commit 13f590af2ee74b2b01c5c1a3414a92764648c89e +Author: Simon McVittie +Date: 2016-03-05 16:32:25 +0000 + + Make dbus.version a tuple again + + Otherwise it won't sort correctly. + + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816729 + Signed-off-by: Simon McVittie + +M dbus/_version.py.in + +commit 135eeb0c0ddc871c5b5dfbaf09aace94f7126cc7 +Author: Simon McVittie +Date: 2016-03-05 16:08:03 +0000 + + Always include dbus_bindings-internal.h first + + This file includes , with some #defines that affect the + interpretation of the Python headers (PY_SSIZE_T_CLEAN, + PY_SIZE_T_CLEAN). + + In particular, transitively includes pyconfig.h, which + defines _GNU_SOURCE, altering the version of struct stat used; + this is potentially a problem if a struct stat is shared between + files, although in practice we don't do that. + + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749133 + +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/debug.c +M _dbus_bindings/float.c +M _dbus_bindings/int.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message-internal.h +M _dbus_bindings/module.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/types-internal.h +M _dbus_bindings/unixfd.c + +commit 3f7aa13c82444457675763cdf0d3bb5c5a45d137 +Author: Simon McVittie +Date: 2016-03-05 16:02:53 +0000 + + Include config.h every time we compile C code + + This is Autoconf best-practice: on some platforms it might contain + things like "#define inline __inline" which should affect all C code. + + Signed-off-by: Simon McVittie + +M Makefile.am +M _dbus_bindings/compat-internal.h +M _dbus_bindings/mainloop.c +M _dbus_bindings/message-append.c +M _dbus_bindings/module.c + +commit c729593c36c745f99daa02abb955a19737bf37cb +Author: Simon McVittie +Date: 2016-03-05 15:50:33 +0000 + + Move dbus-python.h to a dbus subdirectory + + This means we can consistently #include , + either in-tree or out-of-tree. + + Signed-off-by: Simon McVittie + +M Makefile.am +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_glib_bindings/module.c +R100 include/dbus-python.h include/dbus/dbus-python.h +M test/dbus_py_test.c + +commit 01ecf02c749f7bddb15f57aae26e9e064db0240f +Author: Simon McVittie +Date: 2016-02-22 17:26:54 +0000 + + fix NEWS syntax + +M NEWS + +commit 568aa2c958d33ddb8b798add8f01b881dee8f432 +Author: Simon McVittie +Date: 2016-02-22 17:05:03 +0000 + + apply development version + +M NEWS +M configure.ac + +commit 261f510ec0196f3f3c55c4ac7c4bedc879bdd8f3 +Author: Simon McVittie +Date: 2016-02-22 16:35:13 +0000 + + 1.2.2 + +M NEWS +M configure.ac + +commit 7fd4c59f906cec2d6b87fde795a72499314273ee +Author: Simon McVittie +Date: 2016-02-22 16:04:33 +0000 + + Disable Automake maintainer mode when building via setup.py + + pip doesn't preserve timestamps in tarballs, so half the build system + is going to look as though it has been changed. + + Signed-off-by: Simon McVittie + +M configure.ac +M setup.py + +commit afcf3e432efa8bed73c714d03062fbf53cc76bdf +Author: Simon McVittie +Date: 2016-02-22 13:18:35 +0000 + + Make all test scripts properly executable + + Signed-off-by: Simon McVittie + +M test/cross-test-client.py +M test/cross-test-server.py +M test/test-exception-py2.py +M test/test-exception-py3.py +M test/test-p2p.py +M test/test-signals.py +M test/test-unusable-main-loop.py + +commit 84b7bdafc1deecd9451ba52c30e5dc63a7ebb056 +Author: Simon McVittie +Date: 2016-02-22 13:18:18 +0000 + + Don't install crosstest.py executable + + It's meant to be imported, not executed. + + Signed-off-by: Simon McVittie + +M Makefile.am + +commit a7c0dc02695addec1a2ed4c2277878c514883c9d +Author: Simon McVittie +Date: 2016-02-22 12:27:22 +0000 + + Fix setup.py in tarballs on Python 2 + + Signed-off-by: Simon McVittie + +M setup.py + +commit e443d3b5c60cf2f5fda17bcba47be3c8279b3140 +Author: Simon McVittie +Date: 2016-02-19 12:47:33 +0000 + + Use AX_IS_RELEASE with the micro-version policy + + Signed-off-by: Simon McVittie + +M NEWS +M configure.ac +M dbus/_version.py.in + +commit 3df99bcbe3e80467f050484d83eca9ffae03e947 +Author: Simon McVittie +Date: 2016-02-19 12:37:59 +0000 + + Use AX_GENERATE_CHANGELOG to generate ChangeLog + + Signed-off-by: Simon McVittie + +M Makefile.am +M configure.ac + +commit 55d8f3fc9cdfe5b8f00c546a7264b195fb655148 +Author: Simon McVittie +Date: 2016-02-19 12:18:27 +0000 + + .gitignore: update and sort + +M .gitignore + +commit bfa02dd9f85f90200de796ad2d9e65596e8add6b +Author: Simon McVittie +Date: 2016-02-19 12:17:26 +0000 + + check-coding-style: work in out-of-tree builds + +M tools/check-coding-style.mk + +commit 67759dbc248f4eb05855a796eea6d464e051b2e8 +Author: Simon McVittie +Date: 2016-02-19 12:05:02 +0000 + + configure.ac: avoid misleading syntax highlighting + + Signed-off-by: Simon McVittie + +M configure.ac + +commit af14eca77a3f2c037b1aca4d3f6945ffa2b985db +Author: Simon McVittie +Date: 2016-02-19 12:04:44 +0000 + + configure.ac: use AS_CASE, AS_IF + + Signed-off-by: Simon McVittie + +M configure.ac +M m4/dbus-py-add-rst2htmlflag.m4 + +commit 00e36366aa437f592a8e7d9dad5a7764890f40b2 +Author: Simon McVittie +Date: 2016-02-19 11:57:11 +0000 + + Make autoconf fail with an explanatory message if an AX_ macro + is missing + + Signed-off-by: Simon McVittie + +M configure.ac + +commit 19879fa7aebea51677550ad2d7cdb07f16ac134f +Author: Simon McVittie +Date: 2016-02-17 13:02:16 +0000 + + Remove a leftover reference to m4/am-check-pymod.m4 + + Signed-off-by: Simon McVittie + +M Makefile.am + +commit d14e14ad8e4b64203c87b64f176f72803dfccf4e +Author: Simon McVittie +Date: 2016-01-21 20:17:16 +0000 + + Use AX_PYTHON_MODULE from autoconf-archive instead of AM_CHECK_PYMOD + +M configure.ac +D m4/am-check-pymod.m4 + +commit 14a609ac5e4706bc9ebbe83de8168eb3399bf50c +Author: Simon McVittie +Date: 2016-01-21 20:09:27 +0000 + + Ignore .dirstamp files + +M .gitignore + +commit 88e9da1ddec51a99246d5128a6202dd9205af34c +Author: Simon McVittie +Date: 2016-01-21 20:06:09 +0000 + + Add a setup.py which wraps Autotools in something virtualenv-friendly + +M .gitignore +M Makefile.am +A setup.py + +commit d7677ab1bcabe60e84215eb17b51b644737bfcb0 +Author: Simon McVittie +Date: 2016-01-20 12:39:07 +0000 + + Use gi instead of gobject, everywhere except dbus.gobject_service + +M doc/tutorial.txt +M examples/example-async-client.py +M examples/example-service.py +M examples/example-signal-emitter.py +M examples/example-signal-recipient.py +M examples/gconf-proxy-service2.py +M examples/unix-fd-service.py +M test/test-server.py + +commit ea0e8705750e8b4448e5e51c86d07132cf1ac1c8 +Author: Simon McVittie +Date: 2016-01-20 12:38:48 +0000 + + Replace hard-coded sleep with a wait for the D-Bus name to appear + +M Makefile.am +M test/run-test.sh +A test/wait-for-name.py + +commit c145c7c6b6c62ef097ed33e1abeaa2987b01007d +Author: Simon McVittie +Date: 2016-01-20 12:19:26 +0000 + + Use non-recursive make for tests, and make them into installed-tests + +M Makefile.am +M configure.ac +D test/Makefile.am +M test/TestSuitePythonService.service.in +D test/dbus_python_check.py +M test/run-test.sh +M test/test-client.py +M test/test-p2p.py +M test/test-service.py +M test/test-signals.py +M test/test-standalone.py +M test/tmp-session-bus.conf.in + +commit 9567e3eab6672705f7259970e8606f4e7adaf991 +Author: Simon McVittie +Date: 2016-01-20 10:48:19 +0000 + + Use non-recursive make for everything except tests + +M Makefile.am +D _dbus_bindings/Makefile.am +D _dbus_glib_bindings/Makefile.am +M configure.ac +D examples/Makefile.am +D m4/Makefile.am +M test/Makefile.am +D tools/Makefile.am + +commit b95a7f0f596e3e3d000c3756bb520d28b127d5e1 +Author: Simon McVittie +Date: 2015-12-06 17:46:21 +0000 + + Simplify testing by using dbus-run-session and Automake "log compiler" + + Fall back to Telepathy's old with-session-bus.sh script if dbus + doesn't + have dbus-run-session (versions < 1.8). + + Also run most of the tests individually, instead of under run-test.sh. + +M configure.ac +M test/Makefile.am +M test/run-test.sh +D test/run-with-tmp-session-bus.sh +A test/with-session-bus.sh + +commit f8379493b1c413d7b583025d47a38f042b710d89 +Author: Simon McVittie +Date: 2015-12-06 10:35:59 +0000 + + .gitignore: anchor most patterns at $(top_srcdir), and sort + +M .gitignore + +commit 192b5d4ed0021f1e15e42e52763bd4cd32a3b502 +Author: Simon McVittie +Date: 2015-12-05 21:27:10 +0000 + + Don't try to build epydoc documentation if we can't "import epydoc" + +M configure.ac + +commit 407ad2d298188b83763f7003ae224b505f07e162 +Author: Simon McVittie +Date: 2015-12-06 10:33:28 +0000 + + Put Autoconf droppings in build-aux/ + +M .gitignore +M configure.ac + +commit 8cbfa02ca5c9847bffabc88320fa4c612d517f86 +Author: Simon McVittie +Date: 2015-12-06 10:33:13 +0000 + + Use AX_COMPILER_FLAGS from autoconf-archive + +M NEWS +M m4/Makefile.am +D m4/jh-add-cflag.m4 +D m4/tp-compiler-flag.m4 +D m4/tp-compiler-warnings.m4 + +commit 9eae0f2693acee05887125a46190e682fa119e78 +Author: Simon McVittie +Date: 2015-12-05 15:41:11 +0000 + + Use AX_COMPILER_FLAGS + +M _dbus_bindings/Makefile.am +M _dbus_glib_bindings/Makefile.am +M configure.ac +M test/Makefile.am + +commit f8479140d228d7d5043069a0e966e9d3bf94e341 +Author: Simon McVittie +Date: 2015-12-05 15:40:52 +0000 + + Update build system for Automake 1.13 (parallel test driver) + +M configure.ac +M test/Makefile.am + +commit 6e4ebe32f0f14aceb91011e422eb232e8dd21d4f +Author: Simon McVittie +Date: 2015-12-05 15:39:30 +0000 + + _dbus_py_assertion_failed: flag as NORETURN + +M _dbus_bindings/dbus_bindings-internal.h + +commit 2ad803c5326af0569fdb36ce90166292b9fe9a79 +Author: Simon McVittie +Date: 2015-12-04 17:32:03 +0000 + + configure.ac: use AS_IF for PYTHON_LIBS + +M configure.ac + +commit 8d794193c8ac611f27d32333d50873d4d97aace0 +Author: Simon McVittie +Date: 2015-12-04 17:31:44 +0000 + + Try ${PYTHON}-config before searching PATH + + This is helpful for Debian's special debug-build interpreters + such as python3.4-dbg, each with an accompanying python3.4-dbg-config. + +M m4/am-check-python-headers.m4 + +commit 6ebbb5bc7abaf3caaa88cc11f6d3969e3f665544 +Author: Yamashita, Yuu +Date: 2015-09-22 23:42:38 +0900 + + Find `python-config` from PATH properly + + Expecting `python-config` at the same directory as `python` executable + would not be suitable if user is using virtualenv. + +M configure.ac +M m4/am-check-python-headers.m4 + +commit 998c10b8ec9058f213752818fa20d8362c15c02d +Author: Simon McVittie +Date: 2015-12-04 15:13:34 +0000 + + gconf examples: add brief documentation + +M examples/gconf-proxy-client.py +M examples/gconf-proxy-service2.py + +commit 77075d82f4ec39c35d14536cf13e4266839ae81f +Author: Simon McVittie +Date: 2015-12-04 15:13:22 +0000 + + Use a name in example.com for our example GConf proxy + + dbus-python is not a GNOME project, so we should not use their + namespace. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85720 + +M examples/gconf-proxy-client.py +M examples/gconf-proxy-service2.py + +commit 1dbda697112becc44e0aa8e303159e0fae5852a3 +Author: Ben Longbons +Date: 2014-10-31 14:35:53 -0700 + + Install all examples + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85720 + Reviewed-by: Simon McVittie + [smcv: separated out from a previous commit] + +M examples/Makefile.am + +commit f8ffd3ab796ae622912b243c1e6f1d3e12c90ad7 +Author: Ben Longbons +Date: 2014-10-31 14:35:53 -0700 + + Consistently make examples executable + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85720 + Reviewed-by: Simon McVittie + [smcv: separated out from a previous commit] + +M examples/example-async-client.py +M examples/example-client.py +M examples/example-service.py +M examples/example-signal-emitter.py +M examples/example-signal-recipient.py +M examples/list-system-services.py + +commit 246e5b03a137e64611c6f1e368250804d66f73f6 +Author: Ben Longbons +Date: 2014-10-31 14:35:53 -0700 + + Fix GConf examples + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85720 + Reviewed-by: Simon McVittie + [smcv: separate out some changes into separate commits] + +M examples/gconf-proxy-client.py +M examples/gconf-proxy-service2.py + +commit 6185aeb81969b82da804c66958d64bc628cb5aa4 +Author: Ben Longbons +Date: 2014-10-31 14:35:53 -0700 + + Include FallbackObject in "from dbus.service import *" + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85720 + Reviewed-by: Simon McVittie + [smcv: separate out some changes into separate commits] + +M dbus/service.py + +commit 425993a3107812734b1138a5a011fed4fc041fef +Author: Simon McVittie +Date: 2013-05-08 14:09:46 +0100 + + development version + +M NEWS +M configure.ac + +commit d0d5b5be685dc4c16b21c54335becc87ca4d6f58 +Author: Simon McVittie +Date: 2013-05-08 08:49:58 +0100 + + distribute new tests + +M test/Makefile.am + +commit bd6aac594c72d32057a5821fcedb2d36644526aa +Author: Simon McVittie +Date: 2013-05-08 08:48:28 +0100 + + 1.2.0 + +M NEWS +M configure.ac + +commit 9b26cf8238a7d432fe96a50a75008aa6bce110da +Author: Simon McVittie +Date: 2013-05-08 08:38:22 +0100 + + Add support for skipping tests, and use it + + Now that Python 2.6 isn't a supported version in Debian, it doesn't + get a gi module, but we can still get some minimal test coverage. + +M test/cross-test-client.py +M test/cross-test-server.py +M test/run-test.sh +M test/run-with-tmp-session-bus.sh +M test/test-client.py +M test/test-p2p.py +M test/test-signals.py + +commit 0872782255fdbaeda64311a298664597e59ba94f +Author: Simon McVittie +Date: 2013-05-08 08:37:13 +0100 + + utf8 test: pass when used with dbus 1.6.10, 1.7.2 + + We used to reject noncharacters, but now we accept them. + +M test/test-standalone.py + +commit f909f596705f62a5218cf16d61433364fe2f8168 +Author: Marko Lindqvist +Date: 2013-05-07 20:16:20 +0100 + + Replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This has been (silently!) deprecated since 2002 and was removed from + Automake 1.13. + + [added commit message -smcv] + Reviewed-by: Simon McVittie + +M configure.ac + +commit 423ee853dfbb4ee9ed89a21e1cf2b6a928e2fc4d +Author: Simon McVittie +Date: 2013-04-22 17:40:51 +0100 + + Use GObject.__class__ instead of GObjectMeta + + In pygobject 3.8, GObjectMeta is no longer available via + gi.repository.GObject. What we actually want is "the metaclass of + GObject", so, say so. + +M NEWS +M dbus/gi_service.py +M dbus/gobject_service.py + +commit c9ad0a3909c80c09d33b21db6cb46cfee4489010 +Author: Simon McVittie +Date: 2013-04-22 15:47:06 +0100 + + Unset DBUS_STARTER_ADDRESS, DBUS_STARTER_BUS_TYPE + + See . + +M test/run-with-tmp-session-bus.sh + +commit 121c294b1853a280b01e0504eb1828c6d0e07bbc +Author: Simon McVittie +Date: 2013-04-22 15:44:57 +0100 + + Require D-Bus 1.6, drop fallback paths + +M NEWS +M _dbus_bindings/compat-internal.h +M _dbus_bindings/message-append.c +M configure.ac + +commit c57c4d281369589b636aee928238b7cf6e42e00f +Author: Simon McVittie +Date: 2012-10-23 19:34:35 +0100 + + NEWS + +M NEWS + +commit f52465232234ae71fa16741abcd57aab155949ad +Author: Thiago Macieira +Date: 2012-10-23 11:12:21 -0700 + + Update the confusing notice of what license dbus-python is under + + We tried to change the license for the D-Bus core too but were unable + to reach all copyright holders. The MIT license was the suggested new + license and all reached parties had agreed to. + + Reviewed-by: Simon McVittie + +M COPYING + +commit d262628e89115bbcc33c439c77d33733c4a23491 +Author: Simon McVittie +Date: 2012-10-16 18:33:08 +0100 + + DBusException: override both __str__ and __unicode__ + + Avoid chaining up to the superclass, because that behaves particularly + oddly. This fixes regression test failures: str(some_dbus_exception) + was no + longer prefixed with the D-Bus error name under Python 2. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55899 + +M dbus/exceptions.py + +commit 544e05a16e55dad7e666baabfb665997a79d6580 +Author: Simon McVittie +Date: 2012-10-16 18:31:43 +0100 + + Slightly better test coverage + +M test/test-client.py + +commit efdd1823239b02fe5a39e766cbd7597e6c3fcb96 +Author: Simon McVittie +Date: 2012-10-16 17:52:36 +0100 + + Use a form of assertRaises() that works in Python 2.6 + +M test/test-exception-py2.py + +commit 83615efbed565a689008b00a4ac82fc0fc4e5603 +Author: Simon McVittie +Date: 2012-10-16 17:52:22 +0100 + + Skip test_dbus_exception_convert_str_fail under unusual default + encodings + + This would actually work fine if the default encoding was UTF-8 or + Latin-1 or something. + +M test/test-exception-py2.py + +commit 09b540bd55fb2fca14d4df7e0c520b8ba0ce4646 +Author: Michael Vogt +Date: 2012-10-12 13:37:51 +0200 + + Support unicode messages for DBusException in Python 2 + + [commit message amended -smcv] + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55899 + Reviewed-by: Simon McVittie + +M dbus/exceptions.py +M test/run-test.sh +A test/test-exception-py2.py +A test/test-exception-py3.py + +commit 5558ee11313fd929ed6aeb22228e89de2263e520 +Author: Simon McVittie +Date: 2012-07-04 12:17:10 +0100 + + Link Python extensions differently on Windows + +M _dbus_bindings/Makefile.am +M _dbus_glib_bindings/Makefile.am +M configure.ac + +commit ec2671485a23090c470180eb297e67b86638d9b5 +Author: Simon McVittie +Date: 2012-07-04 12:15:16 +0100 + + Replace incorrect AM_LDFLAGS usage with a proper AM_LDFLAGS/LIBADD + split + +M _dbus_bindings/Makefile.am +M _dbus_glib_bindings/Makefile.am + +commit 9c02d05642c8f99e3fe61804bcc33df380ebd5b1 +Author: Simon McVittie +Date: 2012-07-04 20:27:12 +0100 + + run-test.sh: don't go via make to run the cross-test + + Based on a patch from Christoph Höger. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51725 + +M test/run-test.sh + +commit e8a507570e12778a0f325786fcf9f5f768019118 +Author: Simon McVittie +Date: 2012-07-04 19:49:13 +0100 + + NEWS + +M NEWS + +commit f3199102a68c72460fd0a025ab966557a0996223 +Author: Simon McVittie +Date: 2012-07-04 19:49:07 +0100 + + Don't include stdint.h + + Every use here turns out to be unnecessary, some compilers *still* + don't have it after more than a decade in ISO C, and if we need + fixed-length integer types we can use the ones from D-Bus. + +M _dbus_bindings/abstract.c +M _dbus_bindings/bytes.c +M _dbus_bindings/containers.c +M _dbus_bindings/float.c +M _dbus_bindings/signature.c +M _dbus_bindings/types-internal.h + +commit 6f5ec9552ca169b66b338698850a125151e3599c +Author: Simon McVittie +Date: 2012-07-04 19:36:26 +0100 + + Re-indent now that the indentation is unecessary + +M _dbus_bindings/server.c + +commit 5b79604a6d1eb11268293342d19da633e5eedaa4 +Author: Simon McVittie +Date: 2012-07-04 19:35:43 +0100 + + Avoid variable-length arrays, which MSVC *still* doesn't support + + Based on patches from Christoph Höger. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51725 + +M _dbus_bindings/message-append.c +M _dbus_bindings/server.c + +commit bdc48547078b8ba09856c81b7c4f148fb163c01b +Author: Simon McVittie +Date: 2012-07-04 19:19:12 +0100 + + Use AC_C_INLINE to make sure "inline" works + +M configure.ac + +commit 3d23ff9e91151c2fb8e5ccb74067ff7ad6df3067 +Author: Simon McVittie +Date: 2012-06-25 21:20:12 +0100 + + reset to unreleased + +M configure.ac + +commit 86b978042fa23d9b262cb0baa40398e21ddb0530 +Author: Simon McVittie +Date: 2012-06-25 21:19:35 +0100 + + prepare release + +M NEWS +M configure.ac + +commit f6066573d25508f5cbbc5c12254086d419bb8828 +Author: Simon McVittie +Date: 2012-06-25 17:01:51 +0100 + + fd.o #40817: validate UTF-8 according to the same rules as libdbus + +M NEWS +M _dbus_bindings/message-append.c +M configure.ac +M test/test-standalone.py + +commit 4a0f4379d4a5783d576aec90019a39459eff007d +Author: Simon McVittie +Date: 2012-06-05 19:39:20 +0100 + + NEWS + +M NEWS + +commit 6ff89bf0d05a550cf1aff2053579fc1f0192cd97 +Author: Simon McVittie +Date: 2012-06-05 19:07:51 +0100 + + Py3: correctly guess the signature of ObjectPath(...) and + Signature(...) + + Under Python 2, ObjectPath and Signature are subtypes of str (= + bytes), + and the existing type-guessing worked. + + The type-guessing code assumed that all unicode objects were just + strings, but that assumption became false in the Python 3 port: + ObjectPath and Signature are still subtypes of str, but str now means + unicode, not bytes. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=50740 + +M _dbus_bindings/message-append.c +M test/test-standalone.py + +commit 2f08b9e644c8530c4d324c4bd9d8a0cdb24edc92 +Author: Simon McVittie +Date: 2012-05-09 17:50:59 +0100 + + Back to unreleased status + +M NEWS +M configure.ac + +commit 4a4bce958b3257b7cb2adc050022879660aface1 +Author: Simon McVittie +Date: 2012-05-09 15:47:48 +0100 + + 1.1.0 + +M NEWS +M configure.ac +M dbus/gobject_service.py + +commit e2e589889ef5257f62cc3a32561142f625716ef0 +Author: Simon McVittie +Date: 2012-05-02 11:11:11 +0100 + + Make AM_CHECK_PYTHON_HEADERS compatible with Python 3 in the absence + of python3-config + +M m4/am-check-python-headers.m4 + +commit 2f59718a4bf22cbea28e0c7b2f880f86d4497a7a +Author: Simon McVittie +Date: 2012-05-02 10:44:13 +0100 + + Deprecate dbus.gobject_service and make it vaguely compatible with 1.0 + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48904 + +M dbus/gobject_service.py + +commit 5b9f87676802f04ebc339fd16a4a30dc42e33c91 +Author: Simon McVittie +Date: 2012-05-02 10:41:27 +0100 + + Reinstate the old dbus.gobject_service, but only for Python 2 + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48904 + +M Makefile.am +M configure.ac +A dbus/gobject_service.py + +commit ba3f3ff253982c9ad3b5a33df5b120e5692c9d29 +Author: Simon McVittie +Date: 2012-05-02 10:39:29 +0100 + + Rename gobject_service (PyGI version) to gi_service + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48904 + +M Makefile.am +R090 dbus/gobject_service.py dbus/gi_service.py +M test/test-service.py + +commit f264e37f13720898d941f3636f77c489a9a1d845 +Author: Simon McVittie +Date: 2012-03-12 11:41:00 +0000 + + Fix ref leak in dbus_py_variant_level_set + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47108 + Signed-off-by: Simon McVittie + +M _dbus_bindings/abstract.c + +commit c53788657c0cfbd038325e690e7097e31f5e8430 +Author: Simon McVittie +Date: 2012-02-29 13:35:24 +0000 + + Put sockets for the regression tests in /tmp, not ${builddir} + + Some automated build systems (naming no Portage) have really long + build + directories, which can cause dbus-python to hit the length limit + for Unix + sockets' names. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46747 + Signed-off-by: Simon McVittie + +M test/tmp-session-bus.conf.in + +commit 1055343d746accc4048e5806f84a880143444c9f +Author: Simon McVittie +Date: 2011-11-15 16:07:57 +0000 + + Use DBusBasicValue instead of reinventing it, if dbus is new enough + + If we don't find it, continue to reinvent it, but move the reinvention + to an internal header so it's at least the same in both files that + want it. + +M _dbus_bindings/Makefile.am +A _dbus_bindings/compat-internal.h +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M configure.ac + +commit 8e4836c318eb64ef720b497bebc247ac6a468b4b +Author: Simon McVittie +Date: 2012-02-01 10:10:26 +0000 + + Fix _maintainer-update-htmldocs for out-of-tree builds + +M Makefile.am + +commit de81bf8dd5d70f4184412a5c7c2aacd82348d7ea +Author: Simon McVittie +Date: 2012-02-01 10:10:10 +0000 + + Remove TODO, which is now empty - use bugzilla instead + +M Makefile.am +D TODO + +commit 996a3f46f0998219eaf0cd68a744ebc90cfc6dd8 +Author: Simon McVittie +Date: 2012-01-24 20:33:38 +0000 + + back to unreleased + +M configure.ac + +commit c59647b024b3242810fe46e500d557fd56d684d4 +Author: Simon McVittie +Date: 2012-01-24 20:33:26 +0000 + + retroactively add release date + +M NEWS + +commit 5a8eb939ab4603a931457c5d4e8dfcdc323eaf89 +Author: Barry Warsaw +Date: 2012-01-24 16:43:05 +0000 + + Install _compat.py + +M Makefile.am + +commit d1ccc12dd1dee34faae52c7b325048ea801599fd +Author: Simon McVittie +Date: 2012-01-24 16:41:46 +0000 + + Generate ChangeLog correctly when out-of-tree + +M Makefile.am + +commit 1ee2b1a8cf729a71ae56e5671564c5fd62504707 +Author: Simon McVittie +Date: 2012-01-24 16:36:49 +0000 + + Let's call this 1.0 + +M NEWS +M configure.ac + +commit 5b76f66e79f9bc07241a44c0277d4bbebc08ce20 +Author: Simon McVittie +Date: 2012-01-24 16:35:45 +0000 + + Remove duplicate -Werror machinery + +M configure.ac + +commit cd4e91c65624062b5504c10b2af0a05aefbf4878 +Author: Simon McVittie +Date: 2012-01-24 16:35:38 +0000 + + Move PY3PORT into doc, use the same extension as other rst, and + render it + +M Makefile.am +M NEWS +M configure.ac +R100 PY3PORT.rst doc/PY3PORT.txt + +commit 09ca5de0f38d3cc30b8d149b2a8c9f0ad810a09a +Author: Simon McVittie +Date: 2012-01-24 16:21:15 +0000 + + Describe problems, alternatives + +M README + +commit b486edf800ecb9d2e23a35f7ac3151657ee39250 +Author: Simon McVittie +Date: 2012-01-24 16:06:35 +0000 + + Deprecate dbus.glib (use dbus.mainloop.glib or dbus.mainloop.qt4) + +M dbus/glib.py + +commit 50fa5eb54992c28d63b0532533f755ff39f082e2 +Author: Simon McVittie +Date: 2012-01-11 15:02:40 +0000 + + Add INTORLONG_CHECK macro so we don't have to conditionalize + PyInt_Check + +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/message-append.c +M _dbus_bindings/unixfd.c + +commit 4f043cf34a8001c071644eb8c89dc7d43e86b62a +Author: Simon McVittie +Date: 2012-01-11 15:01:39 +0000 + + Use native 'int' (whatever that means) for variant_level etc. + + This reverts the Python 2 API to be in terms of PyInt, leaving the + Python 3 API in terms of PyLong (which is called 'int' in Python + code). + +M NEWS +M PY3PORT.rst +M _dbus_bindings/abstract.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c + +commit cdc0ca5c72686aab38a172f14da3b38fe304baa9 +Author: Simon McVittie +Date: 2012-01-11 14:59:36 +0000 + + update NEWS, PY3PORT.rst + +M NEWS +M PY3PORT.rst + +commit ae61078cc90917c20b14298aaec18e87e149d337 +Author: Simon McVittie +Date: 2012-01-11 14:04:14 +0000 + + Test behaviour of various Message methods + +M test/test-standalone.py + +commit 69342f86b0d036ca41a19363efaf4e8352837c24 +Author: Simon McVittie +Date: 2012-01-11 14:03:53 +0000 + + Do not allow Byte(unicode(x)) (i.e. Byte(str(x)) in Python 3) + + Unicode strings aren't bytestrings, so there's no obvious meaning for + the byte value of a Unicode string of length 1. + +M PY3PORT.rst +M _dbus_bindings/bytes.c +M test/cross-test-client.py +M test/test-standalone.py + +commit cada4883df6b67f4059eedd2def1f5cffa41c7d8 +Author: Simon McVittie +Date: 2012-01-11 12:58:21 +0000 + + Use better names for the superclasses of Byte and ByteArray + + Strictly speaking, DBUS_FOO is libdbus' namespace, not ours. Use + DBUS_PY_FOO. + + DBUS_BYTES_BASE was misleading: it's the base class for a single byte, + so call it DBUS_PY_BYTE_BASE. + +M _dbus_bindings/bytes.c + +commit beaa479066a0139bbb09f058818cd5476f1a79d2 +Author: Simon McVittie +Date: 2012-01-11 12:57:15 +0000 + + Consistently use the str type for identifier-like (ASCII) strings + + Porting to Python 3 left these methods returning unicode, which is + arguably an API break in Python 2: + + * Message.get_member + * Message.get_path_decomposed (array of unicode) + * Message.get_sender + * Message.get_destination + * Message.get_interface + * Message.get_error_name + * Server.get_address + * Server.get_id + + Instead, make them return whatever the natural str type is (bytes in + Python 2, unicode in Python 3). + +M _dbus_bindings/bus.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/message.c +M _dbus_bindings/server.c + +commit a5c77b73651f8f288f7ea2eb9029895eed3cacab +Author: Simon McVittie +Date: 2012-01-11 12:54:26 +0000 + + DBusPythonString base class: use "native str" as base class instead + of reinventing it + +M _dbus_bindings/abstract.c +M _dbus_bindings/dbus_bindings-internal.h + +commit 0daad225ff9085c4013da69e5733e8846e9b8de3 +Author: Simon McVittie +Date: 2012-01-11 12:50:43 +0000 + + SignalMessage.__repr__: include the destination and abbreviate + "interface" more conventionally + + Yes, signals can have a destination. The default is to broadcast. + +M _dbus_bindings/message.c + +commit 9201d65b31305c8bef86ab072b7c33b197ede562 +Author: Barry Warsaw +Date: 2011-12-17 12:09:57 -0500 + + Quash a few more deprecations. + +M test/test-p2p.py +M test/test-signals.py + +commit f8dab5af0bef5d26a51df41a564a5285c16a9cb5 +Author: Barry Warsaw +Date: 2011-12-16 17:07:07 -0500 + + More Python 3 porting, this time primarily to get test-client.py + working. + Changes include: + + - DBusException.get_dbus_message(): In Python 3, the str of the + exception will + already be a unicode, so don't try to decode it unless it's a + bytes object + (a.k.a. 8-bit str in Python 2). + - gobject_service.py: Switch to pygi and rewrite the metaclass + instantiation + code to be portable between Python 2 and Python 3. + - run-test.sh: echo a few more useful environment variables + - test-client.py: + - Globally replace deprecated assertEquals with assertEqual + - Globally replace deprecated assert_ with assertTrue + - Use bytes objects for both 'ay' signatured methods on the server + - AcceptUnicodeString will return a native unicode, i.e. a str in + Python 3 + and a unicode in Python 2. Python 3 has no `unicode` built-in. + - Reformat some long lines for debugging. + - test-service.py: + - Open the log file in 'a' mode for easier tailing. + - AcceptUnicodeString will return a native unicode, i.e. a str in + Python 3 + and a unicode in Python 2. Python 3 has no `unicode` built-in. + - reformat some long lines for debugging. + - Put module-scope code into a main() function and add a bunch + of logger + output for better debugging. `session_bus` must still be + global though. + Wrap main() in a bit try/except to log all top-level exceptions. + +M dbus/exceptions.py +M dbus/gobject_service.py +M test/run-test.sh +M test/test-client.py +M test/test-service.py + +commit 2167b305db78b8345b0f5ea23bfa445fa7cfca4d +Author: Barry Warsaw +Date: 2011-12-16 11:15:01 -0500 + + Re-enable the other tests, even though these still fail for me + (b.f.o #43303). + Fix another except syntax problem. + +M test/run-test.sh +M test/test-client.py + +commit 0c71d7dd6eb843a74931c714d6142921f1971f88 +Author: Barry Warsaw +Date: 2011-12-15 19:58:06 -0500 + + Re-enable previously disabled test. + +M test/cross-test-client.py + +commit ef05d294e85978cf96a86535321cf914b605fa48 +Author: Barry Warsaw +Date: 2011-12-15 19:37:23 -0500 + + Fix the match rule semantics so that a match rule of "arg0='/'" + does not match + object paths in Python3, as per Simon's review comments. + +M dbus/connection.py +M test/test-standalone.py + +commit 8e87ac365f6b08c0617985488dd5d27148c9281d +Author: Barry Warsaw +Date: 2011-12-15 17:55:20 -0500 + + Consistency; clean-up. + +M _dbus_bindings/abstract.c +M _dbus_bindings/bytes.c + +commit f2909c23abc4f8fa55d71673785f8e70a843f6ce +Author: Barry Warsaw +Date: 2011-12-15 16:50:02 -0500 + + - Added back the missing PY3PORT.rst file, with updates. + - Disallow appending unicode objects with 'y' (bytes) signatures. + This now + requires either a bytes object or an integer. Update the tests + to reflect + - this change. + - Fix broken __all__ in Python 3. + +A PY3PORT.rst +M _dbus_bindings/message-append.c +M dbus/types.py +M test/cross-test-client.py +M test/run-test.sh +M test/test-standalone.py + +commit 4c1c2eade1c5b383adad94a7a4fd6553873fecf0 +Author: Barry Warsaw +Date: 2011-12-15 06:57:21 -0500 + + This is the big one; it adds Python 3 support. + +M _dbus_bindings/Makefile.am +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/exceptions.c +M _dbus_bindings/int.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M _dbus_bindings/server.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/types-internal.h +M _dbus_bindings/unixfd.c +M _dbus_glib_bindings/Makefile.am +M _dbus_glib_bindings/module.c +M configure.ac +M dbus/__init__.py +A dbus/_compat.py +M dbus/_dbus.py +M dbus/_expat_introspect_parser.py +M dbus/bus.py +M dbus/connection.py +M dbus/decorators.py +M dbus/proxies.py +M dbus/service.py +M dbus/types.py +M include/dbus-python.h +M test/cross-test-client.py +M test/cross-test-server.py +M test/dbus_py_test.c +M test/run-test.sh +M test/test-client.py +M test/test-p2p.py +M test/test-service.py +M test/test-standalone.py +M test/test-unusable-main-loop.py + +commit 667082d0b4aef9c438a2e7fec89614b5b8ef960a +Author: Barry Warsaw +Date: 2011-12-14 15:05:16 -0500 + + First round of PyInt -> PyLong changes. These are only compatible + with Python + 2, since there are still some unconditional PyInt calls, which are + not valid + in Python 3. However, it lays the framework for conditionalizing + on Python 3 + and using only PyLong in that case. Where it doesn't matter, PyLong + is used + unconditionally. + +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/generic.c +M _dbus_bindings/int.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c +M _dbus_bindings/types-internal.h +M _dbus_bindings/unixfd.c +M test/test-standalone.py + +commit 11c639e3bd2ca3e6a87f349155dda2acc3cd92ea +Author: Barry Warsaw +Date: 2011-12-14 13:54:31 -0500 + + Add error checking to dbus_py_variant_level_get() and call sites. + +M _dbus_bindings/abstract.c +M _dbus_bindings/containers.c +M _dbus_bindings/message-append.c + +commit 71f4481c1876785572170ef68d5624ed23f91333 +Author: Barry Warsaw +Date: 2011-12-14 13:36:39 -0500 + + In preparation for Python 3 support, use the Python 2 PyBytes aliases + for the + PyString API. This makes the code compilable in Python 2.x (x >= + 6) and + Python 3. + +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message.c +M _dbus_bindings/server.c +M _dbus_bindings/signature.c +M _dbus_bindings/types-internal.h + +commit ca7a705663adbac2e781d10c13fc98a5444ef646 +Author: Barry Warsaw +Date: 2011-12-14 12:00:04 -0500 + + In preparation for Python 3 support, all reprs now return unicodes, + which is + legal in Python 2 also. Use fancy REPR macro and the %V format + code for + cross-Python compatibility. + +M _dbus_bindings/abstract.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/int.c +M _dbus_bindings/string.c + +commit 5ff1d938ee230b47dcab8b7703409067df35ed2f +Author: Barry Warsaw +Date: 2011-12-13 17:36:49 -0500 + + Modernize multiline imports in preparation for Python 3 support. + +M dbus/__init__.py +M dbus/_dbus.py +M dbus/bus.py +M dbus/connection.py +M dbus/lowlevel.py +M dbus/proxies.py +M dbus/service.py +M dbus/types.py + +commit dc7b07bc5921cd6263552bb1f3351416327fd67c +Author: Barry Warsaw +Date: 2011-12-13 17:26:15 -0500 + + Modernize `raise` syntax in preparation of Python 3 support. + +M dbus/decorators.py + +commit e033b0c8f22a67abfe2ba1b61365d0c2570b7429 +Author: Barry Warsaw +Date: 2011-12-13 17:22:22 -0500 + + Import threading instead of thread. The latter is gone in Python 3. + +M dbus/_dbus.py +M dbus/connection.py +M dbus/service.py + +commit 061e55e8edbfb457bf56194c52e7d7624855cf41 +Author: Barry Warsaw +Date: 2011-12-13 17:17:46 -0500 + + Fix an inconsequential typo. + +M _dbus_bindings/signature.c + +commit 4477b6120240e186db8d86619f6da63faca296ba +Author: Barry Warsaw +Date: 2011-12-13 17:15:41 -0500 + + For pendantic correctness, and future Python 3 compatibility, + explicitly + initialize the weaklist slots. + +M _dbus_bindings/conn.c +M _dbus_bindings/server.c + +commit 48abd4782f336de2d6dd228e58f86729778e26fb +Author: Barry Warsaw +Date: 2011-12-13 17:08:50 -0500 + + Don't leak the fast_seq object. + +M _dbus_bindings/server.c + +commit 033a0f2890495053fd6474d6f52d4a6e9c32cca1 +Author: Barry Warsaw +Date: 2011-12-13 16:50:38 -0500 + + - Add a few missing Py_TYPE() changes for Python 3 compatibility. + - De-tabbify a few instances that "make check" complains about. + +M _dbus_bindings/bytes.c +M _dbus_bindings/containers.c +M _dbus_bindings/message-append.c + +commit 4a26dab362e8ddd7a765f1249649408f62eb96e7 +Author: Barry Warsaw +Date: 2011-12-13 16:21:04 -0500 + + Additional PyObject_HEAD_INIT -> PyVarObject_HEAD_INIT changes + in preparation + for Python 3 support. + +M _dbus_bindings/abstract.c +M _dbus_bindings/conn.c +M _dbus_bindings/int.c +M _dbus_bindings/libdbusconn.c +M _dbus_bindings/message.c +M _dbus_bindings/server.c + +commit deccd695a43573d31183fe0e93316d306ce989f2 +Author: Alexandre Rostovtsev +Date: 2011-12-13 12:06:17 +0000 + + Fix rst2html build failure in non-unicode locales + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43735 + Signed-off-by: Simon McVittie + +M NEWS +M configure.ac + +commit 75f2aaaa06e57bc1fbdbaf0530e48dea02541b03 +Author: Simon McVittie +Date: 2011-12-13 12:04:25 +0000 + + Update NEWS + +M NEWS + +commit cabcf23207a67cb9215e3efc25ae6e8d73823fd1 +Author: Simon McVittie +Date: 2011-12-13 12:04:19 +0000 + + Remove dbus_bindings, deprecated for nearly 5 years + +M Makefile.am +M NEWS +M dbus/__init__.py +M dbus/_dbus.py +D dbus/dbus_bindings.py +D dbus_bindings.py + +commit 14225c74b5bd75cf6c4cda3647341dc20214e6b8 +Author: Barry Warsaw +Date: 2011-12-13 11:55:44 +0000 + + Use Python 3 syntax to catch exceptions + + Signed-off-by: Simon McVittie + +M dbus/_expat_introspect_parser.py +M dbus/bus.py +M dbus/connection.py +M dbus/proxies.py +M dbus/service.py +M examples/example-client.py +M test/cross-test-client.py +M test/test-client.py +M test/test-service.py + +commit 959ce518a3b5b8794b9813bac82c64540c21fc31 +Author: Barry Warsaw +Date: 2011-12-13 11:51:17 +0000 + + Use PyVarObject_HEAD_INIT to initialize types + + Part of a patch for Python 3 compatibility. + + Signed-off-by: Simon McVittie + +M _dbus_bindings/bytes.c +M _dbus_bindings/containers.c +M _dbus_bindings/float.c +M _dbus_bindings/int.c +M _dbus_bindings/mainloop.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/unixfd.c + +commit 380d1f383c65e767c49d8416dde041a59ba1343e +Author: Barry Warsaw +Date: 2011-12-13 11:46:17 +0000 + + Adjust debug messages + + Part of a patch for Python 3 compatibility. + + Signed-off-by: Simon McVittie + +M _dbus_bindings/message-append.c + +commit fc24dbaa43e1aea47945cc608640022fd8f94093 +Author: Simon McVittie +Date: 2011-12-13 11:39:32 +0000 + + Require Python 2.6, to make porting to Python 3 easier + + Signed-off-by: Simon McVittie + +M NEWS +M configure.ac + +commit ebd44a420264da0031b715f7f08a0b347a81dd30 +Author: Simon McVittie +Date: 2011-12-13 11:38:48 +0000 + + Use Py_TYPE() rather than thing->ob_type, for Python 3 portability + + Based on part of a patch from Barry Warsaw. + + Signed-off-by: Simon McVittie + +M _dbus_bindings/abstract.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/int.c +M _dbus_bindings/libdbusconn.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/server.c +M _dbus_bindings/string.c + +commit dc1c98f05d29c5b7464d7ac34ee900066f261a86 +Author: Simon McVittie +Date: 2011-12-13 11:30:54 +0000 + + _message_iter_get_pyobject: if UTF-8 from libdbus is invalid, + don't crash + + Based on part of a patch from Barry Warsaw. + + Signed-off-by: Simon McVittie + +M _dbus_bindings/message-get-args.c + +commit 876c668ecbc7b79aa04218b90e0f8b617d3997ed +Author: Simon McVittie +Date: 2011-12-13 11:26:31 +0000 + + Don't warn about unused parameters + + Signed-off-by: Simon McVittie + +M configure.ac + +commit d1b628e10626a51c306ac8f59bcfbaae2b6fbf2b +Author: Barry Warsaw +Date: 2011-12-13 11:25:01 +0000 + + Don't leak UTF-8 string if serializing a unicode object fails with OOM + + Signed-off-by: Simon McVittie + +M _dbus_bindings/message-append.c + +commit fb64313b8d37a7869c5489c8ee1bfad0c2c84c0f +Author: Simon McVittie +Date: 2011-12-13 11:22:28 +0000 + + Remove dbus_py_tp_richcompare_by_pointer, dbus_py_tp_hash_by_pointer + + These turn out not to be used for anything. Spotted by Barry Warsaw. + + Signed-off-by: Simon McVittie + +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/generic.c + +commit 3caf4241af3a0fbee5948a217172990bb3c5e0b7 +Author: Simon McVittie +Date: 2011-11-15 16:34:51 +0000 + + NEWS + +M NEWS + +commit 092f60d1887a907434fb34e3a8841b067c21a01e +Author: Simon McVittie +Date: 2011-11-15 16:23:50 +0000 + + Remove support for Python < 2.5 + +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/module.c +M configure.ac + +commit dfa62b24adde8666df4d9cf64569d3aa51063ac8 +Author: Simon McVittie +Date: 2011-11-15 13:33:27 +0000 + + Bump dbus dependency to 1.4 so we can make decent error handling + mandatory + +M _dbus_bindings/message-append.c +M configure.ac + +commit 9c26d255d7d94a6a9be961672ca666de601b561d +Author: Simon McVittie +Date: 2011-05-25 13:51:24 +0100 + + Nano version + +M configure.ac + +commit 6bdb27482cace69935584d2d9b33bdfce50ef5ce +Author: Simon McVittie +Date: 2011-05-25 12:50:36 +0100 + + prepare 0.84 + +M NEWS +M configure.ac + +commit 5ee02bf8785167f042636ab3005105243bff533b +Author: Simon McVittie +Date: 2011-05-24 17:49:20 +0100 + + Let PYTHON_LIBS be overriden on the command line too + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21017 + +M configure.ac + +commit e9feba0f7b3a2b67fd56154185e92eab4b932468 +Author: Simon McVittie +Date: 2011-05-24 17:48:36 +0100 + + Let the user set PYTHON_INCLUDES on the configure command line + + This might be useful for cross-compilation or other strange setups. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21017 + +M m4/am-check-python-headers.m4 + +commit d6962024d7686e40cc012905581cb31c6999b856 +Merge: 4093246 cbc3f71 +Author: Simon McVittie +Date: 2011-05-24 16:39:13 +0100 + + Merge branch 'fd-passing' + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30812 + Tested-by: Elvis Pfützenreuter + +commit 4093246a1593ccc7bf02b5097254df163ab33b8b +Author: Simon McVittie +Date: 2011-05-18 12:30:57 +0100 + + NEWS + +M NEWS + +commit 86653c55435a05d047cc6bb191e2df64f3aa165c +Author: Simon McVittie +Date: 2011-05-17 18:54:55 +0100 + + _ProxyMethod: allow an explicit signature to be given to method calls + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36206 + Reviewed-by: Will Thompson + +M dbus/proxies.py + +commit cbc3f71cebc313b988f8ecc461031c828bfd2302 +Author: Simon McVittie +Date: 2011-05-18 11:10:54 +0100 + + remove stray declaration of dbus_py_unixfd_range_check + +M _dbus_bindings/types-internal.h + +commit 77f745f8a27af7b0ff4692ec02278591cdda2bbf +Author: Simon McVittie +Date: 2011-05-18 11:09:00 +0100 + + unix-fd-service example: also exercise returning UnixFd(int) + + Also, cycle through the three possible return types deterministically, + rather than choosing at random. + +M examples/unix-fd-service.py + +commit 917c41bfcad70c2c519c56a8f2a62e1804c08fc1 +Author: Simon McVittie +Date: 2011-05-18 11:02:58 +0100 + + Don't try to export DBUS_TYPE_UNIX_FD constant if not defined + +M _dbus_bindings/module.c + +commit 04d9fe485b408bf1139e59c457f665a93f514464 +Author: Simon McVittie +Date: 2011-05-18 11:02:44 +0100 + + unixfd: improve documentation + +M _dbus_bindings/unixfd.c + +commit 9d848d864606866f06d3a61cf74e6b9ae44180c1 +Author: Simon McVittie +Date: 2011-05-18 10:49:11 +0100 + + _message_iter_get_pyobject: fix whitespace + +M _dbus_bindings/message-get-args.c + +commit c1f49ac473ac8910aa14f65362088a22e3f60a42 +Author: Simon McVittie +Date: 2011-05-18 10:49:00 +0100 + + UnixFd: don't close file descriptors passed to the constructor as + an int + + Elvis agreed that this shouldn't differ from our handling of + objects with + a fileno(). + + This means that _message_iter_get_pyobject does need to close the fd + itself, so do that. + +M _dbus_bindings/message-get-args.c +M _dbus_bindings/unixfd.c + +commit 630a7c54d85b36b82b1e180703d712ca2d5c5650 +Author: Simon McVittie +Date: 2011-05-18 10:38:49 +0100 + + unixfd: coding style + +M _dbus_bindings/unixfd.c + +commit 13503a5c05b63f19f2d2f65c872fe70debf11700 +Author: Elvis Pfützenreuter +Date: 2010-10-14 14:53:29 -0300 + + Added Unix Fd support to dbus-python + +M _dbus_bindings/Makefile.am +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/module.c +M _dbus_bindings/types-internal.h +A _dbus_bindings/unixfd.c +M dbus/types.py +A examples/unix-fd-client.py +A examples/unix-fd-service.py + +commit 95dc58760290d190a9f62d13d5b3936a0249cb43 +Author: Simon McVittie +Date: 2011-05-17 18:56:45 +0100 + + example-async-client: remove duplicate handle_hello_error() + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=22560 + +M examples/example-async-client.py + +commit 070bddd9a60604ea47f003a0982ee90356092be5 +Author: Simon McVittie +Date: 2011-05-17 18:06:40 +0100 + + adjust Scott's patch to force boolean to be 0 or 1, and for coding + style + +M _dbus_bindings/conn-methods.c + +commit 4965899a9a6bfa1d9969895720089986b997189e +Author: Scott Tsai +Date: 2011-02-16 23:46:39 +0800 + + Wrap dbus_connection_set_allow_anonymous() + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34342 + Signed-off-by: Simon McVittie + +M _dbus_bindings/conn-methods.c + +commit d2fc8a5a4ac2ce8eab519557c40432a6879a7c23 +Author: Scott Tsai +Date: 2011-03-24 22:13:55 +0800 + + ProxyObject: clear _pending_introspect_queue after execution + + Signed-off-by: Simon McVittie + +M dbus/proxies.py + +commit 73fce893626e2e2640a35798266f4ee2bc6c05eb +Author: Simon McVittie +Date: 2010-12-02 17:47:13 +0000 + + Release 0.83.2 + +M NEWS +M configure.ac + +commit d51c445c8460507526124c3874f81a205a1ae4b9 +Author: Simon McVittie +Date: 2010-12-02 17:41:12 +0000 + + NEWS + +M NEWS + +commit 59a0ea47f343da7626ea6f10f661a942f8eb284a +Author: Simon McVittie +Date: 2010-12-02 17:39:08 +0000 + + DBusPyException_ConsumeError: check whether the constructor failed + +M _dbus_bindings/exceptions.c + +commit 28880468dddbb0e063d80dd003145a6322238507 +Author: Simon McVittie +Date: 2010-12-02 17:28:33 +0000 + + Add a regression test for fd.o #23831 + +M .gitignore +M configure.ac +M test/Makefile.am +A test/import-repeatedly.c + +commit d3f57baf2a9e5e26e2365313abd2890239b6572a +Author: Simon McVittie +Date: 2010-12-02 17:27:34 +0000 + + fd.o #23831: make sure to ref types passed to PyModule_AddObject + + This avoids these static types wrongly being deallocated. Python + implements static types as having one initial reference, which + is never + meant to be released, but if you get your refcounting wrong they'll be + "deallocated" (causing a crash) during Py_Finalize. + +M _dbus_bindings/abstract.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/float.c +M _dbus_bindings/int.c +M _dbus_bindings/libdbusconn.c +M _dbus_bindings/mainloop.c +M _dbus_bindings/message.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/server.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c + +commit 56ad64cd14e52b479489549f76343f19e3842139 +Author: Simon McVittie +Date: 2010-12-02 16:31:07 +0000 + + Use Py_CLEAR for greater robustness + +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/generic.c +M _dbus_bindings/int.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/server.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_glib_bindings/module.c +M test/dbus_py_test.c + +commit cb1bbd2414e892469023653ea7ddd5d39cd76b84 +Author: Simon McVittie +Date: 2010-12-02 15:15:02 +0000 + + dbus_py_Message_append: avoid looking beyond the valid part of + a signature + + Similar reasoning: we don't even want to look where the iterator is + pointing if the last call to dbus_signature_iter_next indicated + "no more". + +M _dbus_bindings/message-append.c + +commit db66571902a3406fc58ac453d8bfa7f689f46c42 +Author: Simon McVittie +Date: 2010-12-02 15:13:28 +0000 + + _message_iter_append_multi: bail out safely if a struct isn't filled + + In newer versions of libdbus, calling + dbus_signature_iter_get_current_type + when the iterator is pointing at the ')' of a struct trips an + assertion + failure, rather than just returning INVALID. + +M _dbus_bindings/message-append.c + +commit 3813781fec33ed3cf33cedbfe7d1ecaf8af34aee +Author: Simon McVittie +Date: 2010-12-02 15:10:50 +0000 + + Use dbus_message_iter_abandon_container to bail out, if supported + + This avoids (potentially fatal) warnings, with newer libdbus; + it'll only + work if we were compiled against libdbus >= 1.3.0. + +M _dbus_bindings/message-append.c +M configure.ac + +commit 156463909029aa5f3b56755f488e3ac15ed5a79a +Author: Simon McVittie +Date: 2010-12-02 15:09:00 +0000 + + _message_iter_append_multi: assert that mode is what we expect + +M _dbus_bindings/message-append.c + +commit abefbed911ecab8fb5c08d887479f21b449b392b +Author: Simon McVittie +Date: 2010-12-02 15:08:15 +0000 + + Makefile.am: build API docs etc. last, so they pick up any recent + changes + +M Makefile.am + +commit 53e9cde2ca64de906967546750e5c6dd6aa58da6 +Author: Simon McVittie +Date: 2010-11-23 19:17:19 +0000 + + fd.o #21831: deserialize empty ByteArray objects correctly + + For some reason libdbus gives us NULL instead of a pointer to a + zero-length object (i.e. any random place in the message would + do), which + Py_BuildValue doesn't interpret the way we'd want it to. + +M _dbus_bindings/message-get-args.c +M test/test-standalone.py + +commit 292a9eab92e908b6dc0e97b5ea07c432f41b8bae +Author: Simon McVittie +Date: 2010-11-23 19:06:17 +0000 + + Move CFLAGS_WARNINGS setup after uses of JH_ADD_CFLAG + + We don't want to enable potentially-fatal errors when checking + for things + like -fno-strict-aliasing, because autoconf's test programs provoke + warnings. + +M configure.ac + +commit 83b51706c422662dd0a7d55a40030a1d75c38f88 +Author: Elvis Pfützenreuter +Date: 2010-10-14 23:19:14 -0300 + + Fix compilation in 64-bit architecture + +M _dbus_bindings/message-append.c + +commit 0ed654e18e29f8c23add3d69e57f6b3628c8f848 +Author: Louis-Francis Ratté-Boulianne + +Date: 2010-08-18 14:02:11 -0400 + + Don't override CFLAGS when adding compiler warnings + + Macro function TP_COMPILER_WARNINGS overrides the value of the given + variable (first argument of the function) + + Reviewed-by: Simon McVittie + +M configure.ac + +commit f68a143ac3b19bd40709cbc85b5112fcb0d2e07b +Author: Johan Sandelin +Date: 2010-03-23 15:15:33 +0100 + + Fixed typo in dbus/bus.py where list_activatable_names + would call org.freedesktop.DBus.ListNames instead of + org.freedesktop.DBus.ListActivatableNames + + Reviewed-by: Simon McVittie + +M dbus/bus.py + +commit e2262071188067360a7798ae30d4b694229f6f0f +Author: Simon McVittie +Date: 2010-02-18 18:11:34 +0000 + + Start 0.83.2 + +M NEWS +M configure.ac + +commit 49884241db42ea4d2eadd08cb8b5805a6708c925 +Author: Simon McVittie +Date: 2010-02-18 17:15:57 +0000 + + Prepare version 0.83.1 + + Second try :-) + +M NEWS +M configure.ac + +commit c91476085faaf7456c5b67e431c11b153b3c8762 +Author: Simon McVittie +Date: 2010-02-18 17:35:32 +0000 + + Use telepathy-glib's macros for desirable and undesirable compiler + warnings + +M configure.ac +M m4/Makefile.am +A m4/tp-compiler-flag.m4 +A m4/tp-compiler-warnings.m4 + +commit 65838e33fc871a8cf4b18541a6b0a59af2951eb2 +Author: Simon McVittie +Date: 2010-02-18 17:35:11 +0000 + + Require a halfway modern Automake + +M configure.ac + +commit 4bef0dcf7a040d3656b60e480e9e94b663887ab9 +Author: Simon McVittie +Date: 2010-02-18 17:35:01 +0000 + + Support silent rules if automake >= 1.11 + +M configure.ac + +commit ea197112c5601b0b527b933c3e1241a1bdb02f9f +Author: Simon McVittie +Date: 2010-02-18 17:22:14 +0000 + + Fix signature and return value of Connection_tp_init (oops) + +M _dbus_bindings/conn.c + +commit 1c9d2019260b38f7ee2eef1f73d07c0620ba51f2 +Author: Simon McVittie +Date: 2010-02-18 17:21:56 +0000 + + Revert "Prepare version 0.83.1" + + This reverts commit a63043f262e8938affe515faa145d0f619b9fae6. + +M NEWS +M configure.ac + +commit a63043f262e8938affe515faa145d0f619b9fae6 +Author: Simon McVittie +Date: 2010-02-18 17:15:57 +0000 + + Prepare version 0.83.1 + +M NEWS +M configure.ac + +commit 2124e4f2a44791c92781276ebe7c4e9a458888d5 +Author: Simon McVittie +Date: 2010-02-18 17:15:48 +0000 + + Ignore generated files from newer libtool + +M .gitignore + +commit 35f4c2e950539f3c72628eb758b62ed2a0b70492 +Author: Simon McVittie +Date: 2010-02-18 17:02:13 +0000 + + Use git log rather than git-log, to support distcheck with modern git + +M Makefile.am + +commit 50f0a326c63f35b2cafe8cb9e9082bc2c4a3fa1b +Author: Simon McVittie +Date: 2010-02-18 15:07:39 +0000 + + fd.o#21172: avoid DeprecationWarning with Python 2.6 + +M _dbus_bindings/conn.c + +commit abdf6021b21883beb51d92862caafc127d3c25ec +Author: Simon McVittie +Date: 2010-02-18 15:03:30 +0000 + + tests/cross-test-*: don't use deprecated sets module + + set() has been a built-in since 2.4, and we don't support older + versions. + +M test/cross-test-client.py +M test/cross-test-server.py + +commit add31c0964a0a659443aa534b1f114f4e0a2e7b3 +Author: Simon McVittie +Date: 2010-02-18 14:45:24 +0000 + + fd.o #15013: expose dbus.lowlevel.MESSAGE_TYPE_SIGNAL and friends + +M _dbus_bindings/module.c +M dbus/lowlevel.py + +commit c1ade22086f9d25cfd1d1096307bbf96cbb1ae29 +Author: Simon McVittie +Date: 2008-09-30 15:38:16 +0100 + + Update NEWS again + +M NEWS + +commit a6df6fb20142e7624b78b5c84e9e23cba3d3a3b9 +Author: Huang Peng +Date: 2008-09-30 15:35:39 +0100 + + Message.set_sender: allow org.freedesktop.DBus + + I found Message.set_sender method only accepts unique bus name. But in + my project, I need implement a simple dbus daemon, it need set + the sender + as "org.freedesktop.DBus". + +M _dbus_bindings/message.c + +commit 98d85a33c8570dff007ce79d87657b19e67e0f00 +Author: Simon McVittie +Date: 2008-09-30 15:34:24 +0100 + + NEWS: mention mpg's bugfix + +M NEWS + +commit 29774bca65ef7f887f9dafda56cb167dc0a2e80e +Merge: 884acb5 6a94507 +Author: Simon McVittie +Date: 2008-09-16 11:27:24 +0100 + + Merge branch 'mpg' + +commit 884acb58ef583a7565bfa88f2dc161d10c8adde6 +Author: Simon McVittie +Date: 2008-09-16 11:26:24 +0100 + + Start development for 0.83.1 + +M NEWS +M configure.ac + +commit 6a945076699cd0a5eebde6bcf22a3cc4a4f9e547 +Author: Marco Pesenti Gritti +Date: 2008-09-15 18:09:00 +0100 + + Cleanup self._signal_recipients_by_object_path (fd.o #17551) + + In Connection, add_signal_receiver adds object paths to + self._signal_recipients_by_object_path and they are not cleaned by + remove_signal_receiver. + + As a result self._signal_recipients_by_object_path keeps growing + indefinitely. + + This seem to work for me. I know very little about dbus-python though, + so I + could very well be doing it wrong. + + https://bugs.freedesktop.org/show_bug.cgi?id=17551 + https://bugs.freedesktop.org/attachment.cgi?id=18857 + + Signed-off-by: Simon McVittie + +M dbus/connection.py + +commit 81d0dcd79e1bc6187faa2f6a2f6d4d821f879a0e +Author: Simon McVittie +Date: 2008-07-23 17:45:07 +0100 + + Release version 0.83.0 + +M NEWS +M configure.ac + +commit d634b018107c5aaeaeca704c14b9e853b9d52bfd +Author: Simon McVittie +Date: 2008-07-23 17:36:41 +0100 + + Avoid some compiler warnings + +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_glib_bindings/module.c +M test/dbus_py_test.c + +commit fe5981ca2b90978c75d3308b0f58844fabf8ea4d +Author: Simon McVittie +Date: 2008-07-23 17:36:24 +0100 + + Make the API docs build correctly when out-of-tree + +M Makefile.am +M NEWS + +commit 7ef26213b5b3b46444f87a603ee3bb5c6381a56a +Author: Simon McVittie +Date: 2008-07-23 17:16:43 +0100 + + Require dbus 1.0. + + It's been out for ages, and we can finally drop + DBUS_API_SUBJECT_TO_CHANGE if we do. + +M NEWS +M configure.ac +M dbus-python.pc.in +M include/dbus-python.h + +commit 8c2ef87d94525af4b1e7f21e18b0a07b30ab425b +Author: Simon McVittie +Date: 2008-07-17 13:06:06 +0100 + + Update NEWS again + +M NEWS + +commit d1ded84e774c4aaad9bf02842e1898580dd599ea +Author: Simon McVittie +Date: 2008-07-17 13:00:15 +0100 + + Omit the remote traceback from certain D-Bus errors + + Specifically, DBusException and its subclasses no longer have + the remote + traceback by default (although subclasses can turn it back on again + by setting include_traceback = True, and the various "programmer + error" + subclasses of DBusException do have this set). + + Hopefully this will stop people thinking it's a dbus-python or + telepathy-python bug when a D-Bus API like Telepathy deliberately + raises an + error (and so dbus-python or telepathy-python is visible in the + traceback). + +M dbus/exceptions.py +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit b962965f8c30d785ade69dd6a60924b42d6a1c8d +Author: Simon McVittie +Date: 2008-07-17 12:17:31 +0100 + + Update NEWS. Let's call the next release 0.83 since it's a feature + release + +M NEWS +M dbus/server.py + +commit 90c84c2cbe826e8aa4a4a4d8c4f4926c77590f25 +Merge: a7725c9 b5aa7ce +Author: Simon McVittie +Date: 2008-07-15 19:38:08 +0100 + + Merge branch 'master' into server + +commit b5aa7ce1baa7628c883982f6dde9ca32958db857 +Author: Huang Peng +Date: 2008-07-15 19:37:00 +0100 + + Bugfix for: if using Connection.add_message_filter, only the last + filter will be called + +M _dbus_bindings/conn-methods.c + +commit a7725c9d7589773de7c068f11ca63b95f99ccfcc +Author: Simon McVittie +Date: 2008-07-15 19:33:01 +0100 + + Alter dbus.server.Server API to have pseudo-signals + + By either appending to a list of callbacks, or subclassing and + providing a + method, you can be notified when connections are added or removed. + Inspired by the DBusServer patch from Huang Peng. + +M dbus/server.py +M test/test-server.py + +commit 810b67cd6d30e4af73067090c7fe1ae14952ce00 +Author: Simon McVittie +Date: 2008-07-15 19:30:33 +0100 + + Initialize LibDBusConnection correctly + +M _dbus_bindings/module.c + +commit 07196538f58c069313eeda2c496278f8289b9437 +Author: Simon McVittie +Date: 2008-07-15 19:22:33 +0100 + + Add some more compiler warning flags if supported + +M configure.ac + +commit 88a08077393d4c6f091109ccc819c6ec4664ba71 +Author: Simon McVittie +Date: 2008-07-15 19:22:21 +0100 + + Make DBusPyConnection_NewConsumingDBusConnection static now nobody + else needs to call it + +M _dbus_bindings/conn.c + +commit 2f7e3865c5cae60769b98dac163802e224345fb9 +Author: Simon McVittie +Date: 2008-07-15 19:21:51 +0100 + + DbusPyServer: construct connections by calling the type, so the + object will be fully initialized + +M _dbus_bindings/server.c + +commit bdc76e63da5ca9e017cfbea6c1ce1b0e21ebf706 +Author: Simon McVittie +Date: 2008-07-15 19:15:42 +0100 + + Refactor DBusPyConnection_NewForBus and make it go via + DbusPyConnection_Type.tp_new + + Now that we have the LibDBusConnection temporary objects, we + don't have + to do strange sideways inheritance, we can just chain up to the + superclass + constructor. + +M _dbus_bindings/bus.c + +commit 0f0193180b7853cfea486d0aef1b60d4fa067ed2 +Author: Simon McVittie +Date: 2008-07-15 19:13:55 +0100 + + _dbus_bindings._Connection: sort out constructor + + Accept a LibDBusConnection for the address (sic) parameter, + so we can construct a Connection for a DBusConnection that already + exists. + + The way all this works right now is a bit unfortunate, with hindsight, + but most of it is fixable like this. + +M _dbus_bindings/conn.c + +commit 9d53f6c5179c590089bd6560e266dda538202f93 +Author: Simon McVittie +Date: 2008-07-15 18:59:33 +0100 + + [trivial] un-extern Struct_tp_getattro + +M _dbus_bindings/containers.c + +commit 9d9322f9faf49f7ac8b4c3048f1333a9d7cabb48 +Author: Simon McVittie +Date: 2008-07-15 18:54:54 +0100 + + Add LibDBusConnection in _dbus_bindings + +M _dbus_bindings/Makefile.am +M _dbus_bindings/conn-internal.h +M _dbus_bindings/dbus_bindings-internal.h +A _dbus_bindings/libdbusconn.c + +commit 565d2e88c54d3f2e6dab4ae0ed3202d3a26bfd2c +Author: Simon McVittie +Date: 2008-07-14 18:44:15 +0100 + + Add Connection.call_on_disconnection + +M dbus/connection.py + +commit a7e29e3dbab9651761fc9a7c3ec7fbc27c711286 +Author: Simon McVittie +Date: 2008-07-14 17:30:43 +0100 + + Actually create objects of class Server->conn_class + +M _dbus_bindings/server.c + +commit ee4c9f80cd6a6e839eeebd2e592e4793e9bb61a8 +Author: Simon McVittie +Date: 2008-07-14 17:24:35 +0100 + + dbus.server.Server: implement a stub version of _on_new_connection + +M dbus/server.py + +commit 689e366ec0192920bcc961a0c44e89898d9bd8b1 +Author: Simon McVittie +Date: 2008-07-14 17:19:56 +0100 + + Fix *another* thinko in dbus.server + +M dbus/server.py + +commit 2a646b1a5ac0ac15923e657058703f146f12a452 +Author: Simon McVittie +Date: 2008-07-14 17:18:45 +0100 + + Fix thinko in dbus.server: actually instantiate a _Server + +M dbus/server.py + +commit b9925dc51a1fe6d07c263f7f956005b44ca95b29 +Author: Simon McVittie +Date: 2008-07-14 16:56:02 +0100 + + Add some whitespace to make reStructuredText happy + +M dbus/_dbus.py + +commit c731758bd9d5dfcfe2a9e3176596bb43777ea334 +Author: Simon McVittie +Date: 2008-07-14 16:54:16 +0100 + + Hook DBusServer into the build system. + + Based on parts of the patch by Huang Peng + +M Makefile.am +M _dbus_bindings/Makefile.am +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/mainloop.c +M _dbus_bindings/module.c + +commit 6dcd530f0b6aa158330726d7a5cca9d6dd96eafb +Author: Simon McVittie +Date: 2008-07-14 16:43:15 +0100 + + Rename _dbus_bindings.Server to _dbus_bindings._Server + +M _dbus_bindings/server.c +M dbus/server.py + +commit 87a86d7d6033cbb61271a84f20d5d25c4b4182c0 +Author: Simon McVittie +Date: 2008-07-14 16:41:28 +0100 + + DBusPyServer: construct a user-specified subtype of Connection + +M _dbus_bindings/server.c +M dbus/server.py + +commit 8e213001de0523bd7971fc9251c56635a9e943db +Author: Simon McVittie +Date: 2008-07-14 16:40:32 +0100 + + test-server: import Connection from the right place + +M test/test-server.py + +commit 54a64a6571a6de18b87177ff1410e5d57f574463 +Author: Simon McVittie +Date: 2008-07-14 16:16:22 +0100 + + DBusPyServer initialization: remove some debugging printfs + +M _dbus_bindings/server.c + +commit 05c19f23c63246322e4c9dfed2af47aaf77f7619 +Author: Simon McVittie +Date: 2008-07-14 16:15:43 +0100 + + DBusPyServer get_address, get_id: correct docs, these return str + not String + +M _dbus_bindings/server.c + +commit cf64e96607157f4e73c6dacaa34fb54fead26d1f +Author: Simon McVittie +Date: 2008-07-14 16:14:48 +0100 + + DBusPyServer tp_dealloc: remove a stray debugging printf + +M _dbus_bindings/server.c + +commit d9821035d58c4fe161a9ff0a2546198e2c1dbb49 +Author: Simon McVittie +Date: 2008-07-14 16:13:34 +0100 + + DBusPyServer: correctly unref the partially constructed DBusPyServer + on errors + +M _dbus_bindings/server.c + +commit 6d77f23d062f047437dc8ce428d86a7ad9fa05b2 +Author: Simon McVittie +Date: 2008-07-14 16:12:27 +0100 + + DBusPyServer: correctly unref the weakref object on errors + +M _dbus_bindings/server.c + +commit 603d449610275db1e51816104630cce6d74ac9d4 +Author: Simon McVittie +Date: 2008-07-14 16:11:30 +0100 + + DBusPyServer: fix a typo + +M _dbus_bindings/server.c + +commit 0a888fb732074426d9b0dd6f487dffe5cee9df39 +Author: Simon McVittie +Date: 2008-07-14 16:09:57 +0100 + + DBusPyServer: Fix refcounting of the main loop + +M _dbus_bindings/server.c + +commit 1144c656fa9d956853fd8c03dc52937f60d3ee2e +Author: Simon McVittie +Date: 2008-07-14 16:09:27 +0100 + + DBusPyServer: if there's no main loop, throw an exception + + The code starting at the "err" label assumes that an exception + has been + set already. + +M _dbus_bindings/server.c + +commit 37fd41a721a5417eeb72e90cbe3296f823ccc1b2 +Author: Simon McVittie +Date: 2008-07-14 16:08:26 +0100 + + Document that DBusPyServer_NewDBusServer consumes a reference to + the server. + + Rename it to DBusPyServer_NewConsumingDBusServer to make this clearer. + +M _dbus_bindings/server.c + +commit 1896381006ec54b1dfaf8bbcaaeab14b8a12ed32 +Author: Simon McVittie +Date: 2008-07-14 15:45:35 +0100 + + DBusPyServer: remove some stray debugging printfs + +M _dbus_bindings/server.c + +commit ac83797b39b1d0eacaafcdf42772eab8ca91ce63 +Author: Simon McVittie +Date: 2008-07-14 15:39:02 +0100 + + DBusPyServer: refactor set_auth_mechanisms + + * save a malloc + * return a boolean + * don't crash if the sequence isn't a sequence + * don't coerce items to strings too hard (we only want to accept + str or + unicode, accepting FooObject and trying to use it as an + authentication + method "" would be silly) + +M _dbus_bindings/server.c + +commit 9774cdade2306b9bb641162a14645510fc822c86 +Author: Mathias Hasselmann +Date: 2008-01-31 23:26:30 +0100 + + Initial support for DBusServer class (#14322). + +A _dbus_bindings/server.c +A dbus/server.py +A test/test-server.py + +commit dff98456995c37d964eb32a7de7ca718fc3d48d7 +Author: Simon McVittie +Date: 2008-01-22 12:01:18 +0000 + + Don't assume that libdbus only gives method call messages to + object-path handlers (fd.o #14199) + +M NEWS +M dbus/service.py + +commit 2295b58e4eef9f41a2f917c51408f83a4d2b7efd +Author: Simon McVittie +Date: 2007-12-19 18:19:02 +0000 + + doc/tutorial.txt: Briefly describe how to use the Qt event loop. + Based on a patch from Phil Thompson, riverbankcomputing.co.uk + +M doc/tutorial.txt + +commit e0883f3518f137399077c13409f7a469924c0fd8 +Author: Simon McVittie +Date: 2007-12-10 17:40:23 +0000 + + Unset release flag, and start NEWS for 0.82.5 + +M NEWS +M configure.ac + +commit a536c5ed08c21e35937bc8ea52844c2f19bfdc55 +Author: Simon McVittie +Date: 2007-12-10 17:39:20 +0000 + + Add a maintainer-upload target to the Makefile.am, which uploads + the current .tar.gz and .tar.gz.asc + +M Makefile.am + +commit ca0a58e3ef9fe1cc2b1282b52f652c71b736e182 +Author: Simon McVittie +Date: 2007-12-10 15:14:06 +0000 + + Version 0.82.4 + +M configure.ac + +commit ae97b7432232bc008e20e4696c512bcf69938dd8 +Author: Simon McVittie +Date: 2007-12-10 15:13:48 +0000 + + When user sets reply_handler but not error_handler raise + MissingReplyHandlerException instead of MissingErrorHandlerException, + and vice versa (fd.o #12304, patch from René Neumann) + +M NEWS +M dbus/proxies.py + +commit 2beb7890280ae3b553e59ab8355b65ec203e4776 +Author: Simon McVittie +Date: 2007-10-12 11:34:37 +0100 + + Update NEWS + +M NEWS + +commit 6076d4222af7da5a8aa1de28626423d811ba6be2 +Author: Simon McVittie +Date: 2007-10-12 11:34:28 +0100 + + Don't try to make dbus/Makefile from dbus/Makefile.in; the fix for + #12741 removed it + +M configure.ac + +commit 4fdbc65e42d940ba6cc4445a8a83af90dc3d3a34 +Author: Simon McVittie +Date: 2007-10-09 12:26:21 +0100 + + Revert "Make sure extensions are built before docs; get rid of + strange inter-directory dependency" + + This reverts commit 5321d836844f3bc06a6d5796c9ca902e0bd6f4cc. + +M Makefile.am + +commit 09611c45b3301e93a34a03366e058c3edc184e47 +Author: Simon McVittie +Date: 2007-10-09 12:24:52 +0100 + + Don't distribute COPYING.*, which we no longer have or need + +M Makefile.am + +commit 81897e3143ff5d4c660e4960cc103b92d54ae14d +Author: Simon McVittie +Date: 2007-10-09 12:24:15 +0100 + + Don't try to distribute COPYING.AFL-2.1 and COPYING.GPL-2, which we + no longer have or need + +M Makefile.am + +commit 0a8b67e2d99ed36f30d6709277a40fdd2812953d +Author: Simon McVittie +Date: 2007-10-09 12:20:10 +0100 + + Use MIT/X11 license as per permission given on the dbus mailing list. + This affects code with copyright statements from the following + individuals: + * Anders Carlsson + * Colin Walters + * David Zeuthen + * Rob Taylor + and the following companies: + * Collabora Ltd. (represented by me) + * Red Hat Inc. (represented by Havoc Pennington) + +M COPYING +D COPYING.AFL-2.1 +D COPYING.GPL-2 +M dbus/__init__.py +M dbus/_dbus.py +M dbus/_expat_introspect_parser.py +M dbus/decorators.py +M dbus/glib.py +M dbus/mainloop/glib.py +M dbus/proxies.py +M dbus/service.py +M test/run-test.sh +M test/run-with-tmp-session-bus.sh + +commit 5321d836844f3bc06a6d5796c9ca902e0bd6f4cc +Author: Simon McVittie +Date: 2007-10-09 12:07:57 +0100 + + Make sure extensions are built before docs; get rid of strange + inter-directory dependency + +M Makefile.am + +commit 07b0486fa32ede65b5c05011d56f2ee0694a5176 +Author: Simon McVittie +Date: 2007-10-09 11:43:05 +0100 + + Use non-recursive make for dbus/ to work around types.py clash with + top-level types module (fd.o #12741) + +M Makefile.am +D dbus/Makefile.am + +commit 64eeafbf7a167dd116aeabbcf78ebc257f551e1b +Author: Simon McVittie +Date: 2007-10-09 11:42:00 +0100 + + test/: add some missing copyright headers + +M test/dbus_py_test.c +M test/run-test.sh +M test/run-with-tmp-session-bus.sh + +commit 5295a01631b2a02f948d22417de997a3200a2cee +Author: Simon McVittie +Date: 2007-09-28 11:49:28 +0100 + + License examples under MIT/X11. + According to history of dbus-core before the bindings split, the + examples were + written by Red Hat employees, so we should be OK to relicense them; + and it's + good to have copyright headers. + +M examples/example-async-client.py +M examples/example-client.py +M examples/example-service.py +M examples/example-signal-emitter.py +M examples/example-signal-recipient.py +M examples/gconf-proxy-client.py +M examples/gconf-proxy-service2.py +M examples/list-system-services.py + +commit c658f7804cf892c2c45548dc9283c06ce7249925 +Author: Simon McVittie +Date: 2007-09-28 11:28:26 +0100 + + Use MIT/X11 license for code owned by Collabora and Red Hat only, + as per Havoc's permission + (Message-ID: + <815098350709271800k2505485dlef9414609d392b48@mail.gmail.com>) + +M test/dbus_python_check.py +M test/test-client.py +M test/test-p2p.py +M test/test-service.py +M test/test-signals.py + +commit a6c85a634286fe6ddfb0d15c40a475acf4bd214c +Author: Simon McVittie +Date: 2007-09-27 19:05:06 +0100 + + Unset dbus_python_released following release + +M configure.ac + +commit 137f8e8bbfcd1bef30efe8aec4923c407da180eb +Author: Simon McVittie +Date: 2007-09-27 18:36:07 +0100 + + Version 0.82.3 + +M NEWS +M configure.ac + +commit a5d922d9605ae3c1540cd232cb754a9dc5dc7812 +Author: Simon McVittie +Date: 2007-09-27 18:31:20 +0100 + + Don't try to distribute COPYING.LGPL-2.1 - no longer exists + +M Makefile.am + +commit dfa86e6e601be2ebef25ad99056929ff30e1cac9 +Author: Simon McVittie +Date: 2007-09-27 18:24:58 +0100 + + Fix NEWS indentation + +M NEWS + +commit 4e39a3c08aef2b502e9d330b372b7ab96fac6881 +Author: Simon McVittie +Date: 2007-09-27 18:21:16 +0100 + + Mention relicensing in NEWS + +M NEWS + +commit 2afba7e53cf65fccfd15c87852e791845cff8467 +Author: Simon McVittie +Date: 2007-09-27 18:19:16 +0100 + + Update NEWS, and add regression tests for fd.o #12096 and #12403 + +M NEWS +M test/test-client.py +M test/test-service.py + +commit cb1ffaea799249d6c2dcc9452f758f57392f55e7 +Author: Simon McVittie +Date: 2007-09-27 18:14:11 +0100 + + fd.o #12432: fix documentation for remove_from_connection + +M dbus/service.py + +commit 05460fdecf77c56640c332d290a5950884f26769 +Author: Simon McVittie +Date: 2007-09-27 18:13:42 +0100 + + dbus.exceptions.DBusException: allow setting _dbus_error_name in + subclasses + +M dbus/exceptions.py + +commit 79b4ea50399db59fa8459badf33918764677248d +Author: Simon McVittie +Date: 2007-09-27 17:57:15 +0100 + + Don't raise KeyError when closing private dbus.Bus. (fd.o #12096) + Also deprecate private dbus.Bus in favour of dbus.bus.BusConnection - + the only + things you gain from using dbus.Bus are the shared-instance behaviour + and some + strange more-than-one-way-to-do-it APIs. + +M dbus/_dbus.py + +commit d8c154284ca464f493c81a4d3b5a37890d68acec +Author: Simon McVittie +Date: 2007-09-27 13:57:49 +0100 + + Relicense Collabora code under the MIT/X11 license proposed for dbus + core, removing all references to the LGPL as a result + +M COPYING +D COPYING.LGPL-2.1 +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-internal.h +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/debug.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/float.c +M _dbus_bindings/generic.c +M _dbus_bindings/int.c +M _dbus_bindings/mainloop.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message-internal.h +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/types-internal.h +M _dbus_bindings/validation.c +M _dbus_glib_bindings/module.c +M dbus/bus.py +M dbus/connection.py +M dbus/exceptions.py +M dbus/gobject_service.py +M dbus/lowlevel.py +M dbus/mainloop/__init__.py +M doc/tutorial.txt +M include/dbus-python.h +M test/cross-test-client.py +M test/cross-test-server.py +M test/crosstest.py +M test/test-standalone.py +M test/test-unusable-main-loop.py + +commit 003204b6a58faad7bc937ba029a99204cfa417e1 +Author: Simon McVittie +Date: 2007-09-27 13:56:01 +0100 + + dbus.service: Don't assume that exceptions passed to asynchronous + callbacks are the same as the pending exception + (fd.o #12403, https://dev.laptop.org/ticket/3370) + +M dbus/service.py + +commit 7028d177352b18efa3cc567f6753e1dbdab8f025 +Author: Simon McVittie +Date: 2007-08-06 14:27:01 +0100 + + Update NEWS + +M NEWS + +commit 050bf4a893e24061c3de35eb24c05d3d1002ed28 +Author: Simon McVittie +Date: 2007-08-06 14:26:21 +0100 + + Makefile.am, test/Makefile.am: Use @abs_top_builddir@, + @abs_top_srcdir@ + This fixes incorrect Python path for docs and tests if doing an + out-of-tree + build using an absolute path for $(srcdir), and is also less ugly. + +M Makefile.am +M test/Makefile.am + +commit 33773b778911c890d76c38b13f0fdb39df237d9e +Author: Simon McVittie +Date: 2007-08-01 21:37:50 +0100 + + Unset dbus_python_released + +M NEWS +M configure.ac + +commit af16daa9ff5d7217f361d68ce2bfe405f2cbd412 +Author: Simon McVittie +Date: 2007-08-01 21:37:02 +0100 + + Release 0.82.2 + +M NEWS +M configure.ac + +commit f27c16490c23df1b7700904ea20232ef3e4097ae +Author: Simon McVittie +Date: 2007-08-01 20:00:37 +0100 + + Mention in NEWS that API docs are generated by default + +M NEWS + +commit 44471aab0502cfccef6a4fb63f01feeb6bf8732e +Author: Simon McVittie +Date: 2007-08-01 19:59:19 +0100 + + Reorganise README to reflect that API docs are generated by default + +M README + +commit d3208ff19c3b61ae006403a9096c7a7ac09d4f5f +Author: Simon McVittie +Date: 2007-08-01 19:58:59 +0100 + + Mention incompatibility with 0.82.1 more prominently + +M NEWS + +commit 8a27b1d1164c6c63467d79c497330fefd7c6de6e +Author: Simon McVittie +Date: 2007-08-01 19:27:30 +0100 + + Check for epydoc version >= 3, and default to building API docs + if available + +M configure.ac + +commit 44f7d60ff7ea038c2e314f05f1ccbc3a76f258d5 +Author: Simon McVittie +Date: 2007-08-01 19:15:45 +0100 + + Update NEWS to mention #11623 fix + +M NEWS + +commit 5e6fa32bf95a0d17fe5ce6a4ecdcae5dd3f967d5 +Author: Simon McVittie +Date: 2007-08-01 19:10:37 +0100 + + Add rel_path_keyword to @method (fd.o #11623) + +M dbus/decorators.py +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit 65680613473b7ca39f68d25010b6b17eda841f6a +Author: Simon McVittie +Date: 2007-08-01 19:08:48 +0100 + + Avoid deprecated API in cross-test + +M test/cross-test-client.py +M test/cross-test-server.py + +commit cea890e5e98e1846c47b220b69ae00e843c695a1 +Author: Simon McVittie +Date: 2007-08-01 18:36:37 +0100 + + Update NEWS + +M NEWS + +commit 159319390404ed58406dba5a42d931740660af78 +Author: Simon McVittie +Date: 2007-08-01 18:34:38 +0100 + + Fix introspection on objects with more than one connection or more + than one object path (bugs.fd.o #11794) + +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit 5aef31b429ac0c14312265e166aeeeda91b3f8ac +Author: Simon McVittie +Date: 2007-07-31 19:01:11 +0100 + + NEWS: mention the solved build problems related to python-config + +M NEWS + +commit e821e102b2fa3baff4de719411b03385132dd0f4 +Author: Simon McVittie +Date: 2007-07-31 18:49:43 +0100 + + Re-fix checking for Python include paths. Use $PYTHON-config like + in 0.82.1 if we can, use the hard-coded logic from versions prior + to 0.82.0 if we can't. + +M m4/am-check-python-headers.m4 + +commit f0291410ce950913593d5ae6c9fd4fabd5eaaa3f +Author: Simon McVittie +Date: 2007-07-31 18:04:16 +0100 + + Complete the .m4 renaming + +R100 m4/dbuspy-add-rst2htmlflag.m4 m4/dbus-py-add-rst2htmlflag.m4 + +commit 4764f07dfeee9a3baa90399f9f2a18d7d5175fd2 +Author: Simon McVittie +Date: 2007-07-31 17:47:12 +0100 + + Move dbus-py-add-rst2htmlflag.m4 to jh-add-cflag.m4 - the contents + of two of the .m4 files were the opposite of what they should be + +R100 m4/dbus-py-add-rst2htmlflag.m4 m4/jh-add-cflag.m4 + +commit 3396bcbacfaaa4c2ad4ad1e9d627be8ce14a6d77 +Author: Simon McVittie +Date: 2007-07-31 17:46:42 +0100 + + Move jh-add-cflag.m4 to dbuspy-add-rst2htmlflag.m4 - the contents + of two of the .m4 files were the opposite of what they should be + +R100 m4/jh-add-cflag.m4 m4/dbuspy-add-rst2htmlflag.m4 + +commit a7b73b44ca3b86a0ccf0a58e2c1fdee205633657 +Author: Simon McVittie +Date: 2007-07-31 17:40:20 +0100 + + Revert "Use python-config to get Python cppflags (patch from Ubuntu, + fd.o #11282)." + + Python < 2.5 didn't have python-config (although some distributions, + e.g. + Debian and Ubuntu, shipped it as an add-on). Even for 2.5, some + distributions + install it under gratuitously different names (hi, Gentoo). As + a result, + this patch needs replacing with one that doesn't rely on having + python-config. + + This reverts commit 7c9d08d1ba7f5b0a9aa4a37118e56b1725cdaef9. + +M m4/am-check-python-headers.m4 + +commit 66ebaa801a13be7403e6ec47de1f322ccf310346 +Author: Simon McVittie +Date: 2007-07-31 13:01:04 +0100 + + _dbus_bindings/mainloop.c: Remove Watch and Timeout. + + They were never used, and didn't make a great deal of sense. I now + believe the + right direction for pure-Python mainloop support is to define a + Pythonic main + loop abstraction and coerce libdbus to fit into it, rather than + pretending + the objects in libdbus' abstraction are Python objects. + +M _dbus_bindings/mainloop.c + +commit 4856b6c485c430ac15d4a634b6958d5f6af89dfa +Author: Simon McVittie +Date: 2007-07-31 12:55:16 +0100 + + NEWS: update with timeout fix + +M NEWS + +commit 5ab6cdc200267095edd56645df536dac5d4dc986 +Author: Simon McVittie +Date: 2007-07-31 12:38:02 +0100 + + Measure async call timeout in seconds as intended, not in ms (blocking + calls already used seconds). Add regression tests + +M dbus/connection.py +M test/test-client.py +M test/test-service.py + +commit 70f802152547898f225a0a675789fb923a5ea410 +Author: Simon McVittie +Date: 2007-07-26 17:04:44 +0100 + + test-client: Avoid deprecated usage - explicitly pass SessionBus() + to BusName ctor + +M test/test-client.py + +commit f5eb61dce982d6c51a78f5bb745ebd632ef1ad70 +Author: Simon McVittie +Date: 2007-07-18 21:26:10 +0100 + + Try to avoid importing things from _dbus_bindings when they could + be imported from public API + +M dbus/_dbus.py +M dbus/bus.py +M dbus/connection.py +M dbus/decorators.py +M dbus/glib.py +M dbus/service.py + +commit 4cab9350dda0b36446d7b2a935bd6451a38e67a2 +Author: Simon McVittie +Date: 2007-07-12 16:26:05 +0100 + + Bump version to 0.82.1.YYYYMMDD + +M configure.ac + +commit 07bb7f1de21c64ea1f19ff107910daa2a14ec4ba +Author: Simon McVittie +Date: 2007-07-12 13:13:13 +0100 + + Avoid cpp directives inside macro calls, to be nice to old gcc + versions + +M _dbus_bindings/containers.c +M _dbus_bindings/int.c + +commit a94d9d68d17fd5284aa549187ac6fbb29c188efd +Author: Simon McVittie +Date: 2007-07-11 17:11:08 +0100 + + NEWS, configure.ac: 0.82.1, the "double precision" release + +M NEWS +M configure.ac + +commit e94f1a9a3c4e9a7800e013dd61b06b5538c9b8ac +Author: Simon McVittie +Date: 2007-07-11 15:51:23 +0100 + + Use PyArg_ParseTuple correctly, fixing the timeout in + send_message_with_reply and send_message_with_reply_and_block. + (bugs.fd.o #11489; thanks to Marco Pesenti Gritti for report and + initial patch) + +M NEWS +M _dbus_bindings/conn-methods.c + +commit 9fc1958471a95249984e9556b7dab8838eb19844 +Author: Simon McVittie +Date: 2007-07-03 19:54:06 +0100 + + Unset dbus_python_released + +M configure.ac + +commit a2ee1a4bbdef1613c44be8131b9a89bf8c4543ba +Author: Simon McVittie +Date: 2007-06-29 17:54:02 +0100 + + .gitignore: ignore patch(1) cruft, and detached signatures for the + release tarballs + +M .gitignore + +commit 439ceed581837381aa690b6a0b809a06470d167d +Author: Simon McVittie +Date: 2007-06-29 17:47:23 +0100 + + Update NEWS + +M NEWS + +commit 1b91d2d408ea471af1e4641e7fb31b4534026a70 +Author: Simon McVittie +Date: 2007-06-29 17:38:46 +0100 + + dbus.proxies: If making a call with ignore_reply=True, don't block + for introspection + +M dbus/proxies.py + +commit 06810eb34ed2cdc5f0def02b45680915b0e0b985 +Author: Simon McVittie +Date: 2007-06-21 01:22:27 +0100 + + dbus.service: use DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE + +M dbus/service.py + +commit 9556649e48df344f6ec0010c4af00a076a751760 +Author: Simon McVittie +Date: 2007-06-21 01:22:04 +0100 + + Expose HANDLER_RESULT_HANDLED, HANDLER_RESULT_NOT_YET_HANDLED as + public API in dbus.lowlevel + +M dbus/lowlevel.py + +commit 0d4f60d771305572594fb2cfb502bf565230fa37 +Author: Simon McVittie +Date: 2007-06-21 01:21:33 +0100 + + Get stacklevel right on deprecation of not specifying bus in + BusName.__init__ + +M dbus/service.py + +commit 11925e0a12989793926f82d2286cbb20ef7a179d +Author: Simon McVittie +Date: 2007-06-21 01:20:39 +0100 + + _dbus_bindings: add DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE etc. + +M _dbus_bindings/module.c + +commit d45d56a6ba455ee9b12af4d2c8c448392d74d1b4 +Author: Simon McVittie +Date: 2007-06-21 01:19:39 +0100 + + Avoid using deprecated dbus_watch_get_fd() + +M _dbus_bindings/mainloop.c +M configure.ac + +commit a2f7458105791f37be52e1de22b710968904b235 +Author: Simon McVittie +Date: 2007-06-20 18:01:19 +0100 + + dbus.service: Deprecate the omission of the `bus` argument in the + BusName constructor. + Explicit is better than implicit. + +M dbus/service.py + +commit 39c996ac7439c5c9a61ddb0efc92bada491fa0e5 +Author: Simon McVittie +Date: 2007-06-20 18:00:10 +0100 + + Stop using interactive-Python syntax in tutorial to reduce user + confusion. + Closes bugs.fd.o #11209. + +M doc/tutorial.txt + +commit 9f2e2040c33b09196e438c818379290c9e41a4ca +Author: Simon McVittie +Date: 2007-06-19 18:05:00 +0100 + + Version 0.82.0 + +M NEWS +M configure.ac + +commit 343aaa190f8a1c7475e4565c50483abbc5914a75 +Author: Simon McVittie +Date: 2007-06-19 13:59:23 +0100 + + Improve API documentation markup, particularly adding :Since: + annotations + +M dbus/bus.py +M dbus/connection.py +M dbus/decorators.py +M dbus/proxies.py +M dbus/service.py + +commit e631446a0c3113260c380284fe1f71419d5a7edb +Author: Simon McVittie +Date: 2007-06-19 13:58:37 +0100 + + Mark Bus.get_connection() as deprecated; improve Bus.__repr__ + +M dbus/_dbus.py + +commit 10c49fa072b4f28713cfc873444b902b0bbe021e +Author: Simon McVittie +Date: 2007-06-19 13:37:30 +0100 + + Update NEWS with recent changes; next version should be 0.82.0 I think + +M NEWS + +commit 7c9d08d1ba7f5b0a9aa4a37118e56b1725cdaef9 +Author: Simon McVittie +Date: 2007-06-19 13:22:31 +0100 + + Use python-config to get Python cppflags (patch from Ubuntu, + fd.o #11282). + Thanks to Sebastien Bacher. + +M m4/am-check-python-headers.m4 + +commit 543ebc088ffbef9a52de333d99361b47301571b3 +Author: Simon McVittie +Date: 2007-06-18 16:31:20 +0100 + + Implement fallback objects. + In the process, simplify the signal decorator a bit - don't allow + the signal + to be emitted from a subset of interfaces (removing + connection_keyword), + deprecate path_keyword, disallow path_keyword on objects that + support multiple + object paths, and add rel_path_keyword. This is an API removal + since previous + patches, but is compatible with the last release. + +M dbus/decorators.py +M dbus/service.py +M test/run-test.sh +M test/test-client.py +M test/test-service.py +M test/test-signals.py + +commit b62c9694c5f3e39ef00c08fee5754a91515bca54 +Author: Simon McVittie +Date: 2007-06-15 19:03:03 +0100 + + Unset dbus_python_released + +M configure.ac + +commit c5f1a34d6319e768f38f18817b09134849c74794 +Author: Simon McVittie +Date: 2007-06-15 18:51:46 +0100 + + Update NEWS + +M NEWS + +commit b4a34bf6ac17fae4f0cc67f5b5082856f0aa7283 +Author: Simon McVittie +Date: 2007-06-14 11:05:39 +0100 + + doc/tutorial.txt: @service and @method take dbus_interface=..., + not interface=... + +M doc/tutorial.txt + +commit dbfb6d7b676d22dc98c3ef88071a9deeffa79648 +Author: Simon McVittie +Date: 2007-06-12 14:27:39 +0100 + + dbus.bus: In watch_name_owner, only watch the desired name! + +M dbus/bus.py + +commit 5b408fd8501d79f87bd752f9ce483f5beb6f157b +Author: Simon McVittie +Date: 2007-06-11 18:10:16 +0100 + + dbus.bus: Ignore any errors while cleaning up signal matches, so we + can make the call asynchronously + +M dbus/bus.py + +commit 7f2e0bfe0c205af512af716f4fcb7b8508269eb7 +Author: Simon McVittie +Date: 2007-06-11 14:51:59 +0100 + + dbus.service: Allow objects to start off unexported, and become + exported later. + Also allow them to be exported on more than one object path or + even connection. + dbus.decorators: Allow connection_keyword on signals and methods, + so we can + tell which connection to use for any follow-up actions. + +M dbus/decorators.py +M dbus/service.py +M test/test-service.py + +commit cc6ea2758794601e2747ad9deccf7c8e887b0100 +Author: Simon McVittie +Date: 2007-06-07 20:11:57 +0100 + + dbus.bus: when a unique name goes away, disconnect all signal + handlers. + Unique names are not recycled, so no more signals can arrive for + that name. + +M dbus/bus.py + +commit c2773de718d0cbcac27a60d2fc56063499eeef0e +Author: Simon McVittie +Date: 2007-06-04 14:47:15 +0100 + + Update date in NEWS for 0.81.1 release + +M NEWS + +commit 8d5f51a95f04ddc524e8790a00635082c851b4a1 +Author: Simon McVittie +Date: 2007-06-04 14:19:21 +0100 + + Version 0.81.1 + +M configure.ac + +commit 382b890175ecef7818ce07d8d36cdaab138032df +Author: Simon McVittie +Date: 2007-06-04 12:26:15 +0100 + + NEWS: update + +M NEWS + +commit f1c2dcd0f7b9d177877aafed95fe64343862c1cf +Author: Simon McVittie +Date: 2007-06-04 12:24:58 +0100 + + dbus.service: change unexport() to remove_from_connection() at + J5's request + +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit a370850a68659a771690c2dac7148e371b6c9b51 +Author: Simon McVittie +Date: 2007-06-04 12:10:53 +0100 + + dbus-python.pc.in: Use -I${includedir} to allow libdbus and + dbus-python to be in different ${prefix}es + Patch from Phil Thompson at Riverbank Computing Ltd. + +M dbus-python.pc.in + +commit cf4afc9ccf1408f0f0fde2a01e2dd68ba59de1f9 +Author: Simon McVittie +Date: 2007-05-30 15:52:36 +0100 + + NEWS: Describe the fix for #10457 + +M NEWS + +commit c87b55c6ab30542d5d17f2e2041e4c87b3df712d +Author: Simon McVittie +Date: 2007-05-30 15:19:46 +0100 + + dbus.service: Make it possible to unexport objects (fd.o#10457) + +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit 030b68b4e6d64dc25904618852917839892de1be +Author: Simon McVittie +Date: 2007-05-29 15:33:44 +0100 + + NEWS: mention list_exported_child_objects() and its use in + introspection + +M NEWS + +commit 5618e6182ded0d1861a9fcb5a26440e4454801f6 +Author: Simon McVittie +Date: 2007-05-29 15:33:18 +0100 + + dbus.service: include child nodes in introspection + +M dbus/service.py + +commit 26288ab181eb2452fad7fd94c9bc00c817b4137d +Author: Simon McVittie +Date: 2007-05-29 15:32:01 +0100 + + _dbus_bindings/conn-methods.c: add list_exported_child_objects(). + This is equivalent to dbus_connection_list_registered() in libdbus. + +M _dbus_bindings/conn-methods.c +M test/test-client.py +M test/test-service.py + +commit f0947ab721499d5202cdbfcaad6fac7d781b5666 +Author: Simon McVittie +Date: 2007-05-28 19:47:25 +0100 + + NEWS: mention the fix for Debian#426412 + +M NEWS + +commit ffb1d3310d97bc4d86a09604649f334e3367816f +Author: Simon McVittie +Date: 2007-05-28 19:45:59 +0100 + + dbus.connection: Release signals lock before calling + _clean_up_signal_match(). + This prevents a deadlock when a signal match that's tracking name + owner + changes is removed, causing a match on NameOwnerChanged to be + removed too. + (Debian bug#426412) + + Also move more of the tree manipulation inside the lock, to be nice to + anyone attempting a port to implementations without a GIL (mainly + IronPython), + and add a regression test for the above bug. + +M dbus/bus.py +M dbus/connection.py +M test/test-client.py +M test/test-signals.py + +commit 03bcbff71d4bf112441dfd53300328c70d3a512c +Author: Simon McVittie +Date: 2007-05-21 13:18:18 +0100 + + dbus.bus: detect NameHasNoOwner correctly, using new get_dbus_name() + method + +M dbus/bus.py + +commit 09e138af65710b11363e0852711171c3a9f8ef00 +Author: Simon McVittie +Date: 2007-05-21 13:15:48 +0100 + + NEWS: Describe new DBusException 'args' support + +M NEWS + +commit c68cc723a95f6a4716d61b4ae455e3f8382347e3 +Author: Simon McVittie +Date: 2007-05-21 13:10:09 +0100 + + Describe DBusException.get_dbus_name() in NEWS + +M NEWS + +commit 000536a6b707fe3b28f7afd5360058d48e281688 +Author: Simon McVittie +Date: 2007-05-17 12:41:05 +0100 + + dbus.proxies: Log more informatively when introspection fails, + and use logging rather than just stderr + +M dbus/proxies.py + +commit b052211a63cf833ac394ca529c344c288e921401 +Author: Simon McVittie +Date: 2007-05-16 11:05:29 +0100 + + Implement DBusException in pure Python; add get_dbus_name() method + and name= keyword argument + +M _dbus_bindings/bus.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/exceptions.c +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M dbus/__init__.py +M dbus/_dbus.py +M dbus/bus.py +M dbus/connection.py +M dbus/dbus_bindings.py +M dbus/decorators.py +M dbus/exceptions.py +M dbus/service.py + +commit df88e33eb69ef1528f76d06429d451b8274bd69b +Author: Simon McVittie +Date: 2007-05-16 11:03:34 +0100 + + configure.ac: Reset released flag to 0 + +M configure.ac + +commit 523e63fcef2c3391e94ded7959abdba739a52354 +Author: Simon McVittie +Date: 2007-05-09 10:13:02 +0100 + + Update NEWS for 0.81.0 + +M NEWS + +commit fac67418d9bc51b75f39b108c3e5f0bd9d7e6a98 +Author: Simon McVittie +Date: 2007-05-09 10:03:06 +0100 + + Increment version to 0.81.0 + +M configure.ac + +commit 756d092e3bb346dbf791af32f31c0efe520573d1 +Author: Simon McVittie +Date: 2007-05-09 10:02:33 +0100 + + Don't run the examples during "make check" - timing/startup issues + cause intermittent failures + +M test/run-test.sh + +commit 32c4636888e03025b5f01167cea6530a8fb1ce53 +Author: Simon McVittie +Date: 2007-05-09 09:56:51 +0100 + + Generate ChangeLog during make dist rather than during make. + Commit a dummy ChangeLog so the autotools won't fail in git checkouts. + +M .gitignore +A ChangeLog +M Makefile.am + +commit 46d28550bbe03ccf9853f072743d879ae7d621ff +Author: Simon McVittie +Date: 2007-05-07 15:53:59 +0100 + + dbus/gobject_service.py: Make ExportedGObject __init__ accept + GObject properties + +M dbus/gobject_service.py + +commit 863cec2464edd80fcf7fbdf62cf1c89ecab647d0 +Author: Simon McVittie +Date: 2007-05-04 19:51:50 +0100 + + Create doc directory before writing HTML into it + +M Makefile.am + +commit 727fa4079d91f8dd1b301e21d3e4279c202a9739 +Author: Simon McVittie +Date: 2007-05-04 19:44:18 +0100 + + doc/tutorial.txt: Don't claim we have a tutorial for p2p connections + yet + +M doc/tutorial.txt + +commit 3033d92876dc094d5f86404bdf997af9b3bb3a82 +Author: Simon McVittie +Date: 2007-05-04 19:43:14 +0100 + + Update tutorial to describe add_signal_receiver before + connect_to_signal. + Also remove old ./configure substitutions and update to avoid + deprecated API. + +M doc/tutorial.txt + +commit f1d118f3d8c7dee8f5611cba2786a77e3b3cdaf1 +Author: Simon McVittie +Date: 2007-05-04 19:41:59 +0100 + + Stop tutorial.txt being generated by ./configure - not worthwhile + just for a version number + +M .gitignore +M configure.ac +R100 doc/tutorial.txt.in doc/tutorial.txt + +commit 0432c5256bad3fbdf10240b7ef76cea181c9f8b7 +Author: Simon McVittie +Date: 2007-05-04 19:39:54 +0100 + + dbus/service.py: Before emitting an error, configure logging to + write to stderr, unless already configured + +M dbus/service.py + +commit 24bee8cea054fa21d3229c97d75b2c08f273d9d9 +Author: Simon McVittie +Date: 2007-05-04 19:39:16 +0100 + + Remove contents of TODO: the peer-to-peer Connection now exists and + the string change has been rejected + +M TODO + +commit ed2ace3161337789924e03f559603dccfa40c56e +Author: Simon McVittie +Date: 2007-05-04 17:09:57 +0100 + + dbus/service.py: Don't use deprecated get_connection() in Object + constructor. + The Connection and BusConnection base classes don't have it, and we + can now + export Objects on a plain Connection. + +M dbus/service.py + +commit 774e133d2cdc1a0fda2bd14d2354a9da2deece88 +Author: Simon McVittie +Date: 2007-05-03 13:20:59 +0100 + + Deprecate all arguments called named_service; use bus_name instead + +M dbus/bus.py +M dbus/connection.py +M dbus/proxies.py + +commit 040adaef5646823dfb9247247104cb678cecacad +Author: Simon McVittie +Date: 2007-05-03 13:19:12 +0100 + + examples/list-system-services.py: Make more exemplary + +M examples/list-system-services.py + +commit e6d5bb0209c9cba4d42f12a448bd708a2cabaa9f +Author: Simon McVittie +Date: 2007-05-03 12:11:31 +0100 + + dbus/gobject_service.py: Make ExportedGObject work correctly. + Also add a simple unit test for it. + +M dbus/Makefile.am +M dbus/gobject_service.py +M test/test-client.py +M test/test-service.py + +commit 717837a91498f9f928a0affbfa39d8cd68de5ca1 +Author: Simon McVittie +Date: 2007-05-01 13:26:51 +0100 + + Simplify dbus_bindings backwards compatibility glue + +M dbus/_dbus.py +M dbus/dbus_bindings.py +M dbus_bindings.py + +commit 77566373b89e721e468f411507821ee8a5273fff +Author: Simon McVittie +Date: 2007-05-01 12:18:50 +0100 + + dbus/bus.py: Add watch_name_owner(). + Use it to avoid a race in signal name matching. + Also change SignalMatch API from sender_unique being a public + attribute to + having a method set_sender_name_owner(), and make it hashable so + we can + use it to look up associated signal-sender matches in a dict. + +M dbus/bus.py +M dbus/connection.py + +commit 77f19ef18864f3468b7373bd75461aad3239fe52 +Author: Simon McVittie +Date: 2007-04-30 13:38:50 +0100 + + test/test-p2p.py: Added. Test "peer-to-peer" connections. + (Actually tested by connecting to the bus daemon, because I haven't + implemented + a Python binding for DBusServer yet.) + +M test/Makefile.am +M test/run-test.sh +A test/test-p2p.py + +commit a5905b31f82b898eaa3f80a907ea636e1e3d71eb +Author: Simon McVittie +Date: 2007-04-30 13:33:11 +0100 + + dbus/connection.py: comments + +M dbus/connection.py + +commit c38536726dfced572da01604909888f1f78a0492 +Author: Simon McVittie +Date: 2007-04-30 13:32:52 +0100 + + dbus/bus.py: correct name of logger + +M dbus/bus.py + +commit e96509a88425c0f48c203fbfff100cde901adc7c +Author: Simon McVittie +Date: 2007-04-30 13:15:28 +0100 + + Move signal matching machinery into superclasses + +M dbus/_dbus.py +M dbus/bus.py +M dbus/connection.py + +commit 494191632d27aa60c6f7c8fbcb1b595f8ff0253e +Author: Simon McVittie +Date: 2007-04-30 12:55:21 +0100 + + tools/check-coding-style.mk: Work correctly with out-of-tree builds + +M tools/check-coding-style.mk + +commit 060ffcc1d3f3296c679b4e91c1ed070b2e0205f9 +Author: Simon McVittie +Date: 2007-04-30 12:36:37 +0100 + + Move get_object, constants into Connection and BusConnection. Add + docstrings + +M dbus/_dbus.py +M dbus/bus.py +M dbus/connection.py + +commit dff13840b106cf08a8227379e9bb82e654442e1d +Author: Simon McVittie +Date: 2007-04-30 11:56:42 +0100 + + Convert _BusDaemonMixin and _MethodCallMixin into base classes + BusConnection and Connection. + Also add method activate_name_owner() for proxies to use (so they + don't need + to be aware of whether the connection is a bus daemon or not), + and stop using + deprecated get_connection method. + +M dbus/_dbus.py +M dbus/bus.py +M dbus/connection.py +M dbus/proxies.py + +commit 338b87fcc4010fe92b3f16ebbbf5955eab825dd7 +Author: Simon McVittie +Date: 2007-04-30 11:43:26 +0100 + + dbus/service.py: Use public API for dbus.SessionBus, since we cause + an import anyway + +M dbus/service.py + +commit 2eb946f58e132706683890a8b961423e16998efe +Author: Simon McVittie +Date: 2007-04-30 11:41:44 +0100 + + dbus/_dbus.py: in SignalMatch, use get_name_owner() + +M dbus/_dbus.py + +commit 26cccef4d8e049613b4b815bf9b9bd5ac86dc087 +Author: Simon McVittie +Date: 2007-04-30 11:39:57 +0100 + + dbus/_bus_mixin.py: Add bindings for ListNames, ListActivatableNames, + GetNameOwner too + +M dbus/bus.py +M test/test-client.py + +commit f75c1a0c7f7f4365f1265c6ede0c9465e50466ff +Author: Simon McVittie +Date: 2007-04-30 11:38:32 +0100 + + dbus/_dbus.py: import constants from _dbus_bindings; use + "from...import" + +M dbus/_dbus.py + +commit 1d4594e2463e00def64dd10a71101a4a45e63553 +Author: Simon McVittie +Date: 2007-04-30 11:35:54 +0100 + + dbus/connection.py: Import constants from _dbus_bindings; check for + reserved local interface as well as path + +M dbus/connection.py + +commit 02d302ce90b136991de60015285ff7a39ff54375 +Author: Simon McVittie +Date: 2007-04-30 11:34:33 +0100 + + dbus/bus.py: get BUS_DAEMON_NAME etc. from _dbus_bindings + +M dbus/bus.py + +commit 84beab96c9b9a1270e82e670aa3dca3f208b728f +Author: Simon McVittie +Date: 2007-04-30 11:33:31 +0100 + + dbus/proxies.py: get INTROSPECTABLE_IFACE from _dbus_bindings + +M dbus/proxies.py + +commit 3c62924718ff00839843cecaae09598e36199f79 +Author: Simon McVittie +Date: 2007-04-30 11:31:22 +0100 + + Move the client method-call machinery from dbus.proxies to + dbus.connection._MethodCallMixin. + This makes proxy methods much simpler, and allows the _BusDaemonMixin + to bypass + the proxies module completely (since the signatures are already + known, so + we don't need to introspect anything). + +M dbus/Makefile.am +M dbus/_dbus.py +M dbus/bus.py +A dbus/connection.py +M dbus/proxies.py + +commit e40ec8e4f29d104b66d78b183300e6bf134c2714 +Author: Simon McVittie +Date: 2007-04-30 11:23:58 +0100 + + Remove BusImplementation, removing its remaining functionality + to Connection. + * Move get_unique_name to Connection (it can be useful for connections + which + aren't to a real bus daemon but partially emulate one, like + Telepathy's + Tubes) + * Add set_unique_name to Connection (same reason) + * Convert BusImplementation.__new__ into Connection._new_for_bus + * Have dbus.Bus subclass _dbus_bindings.Connection directly + +M _dbus_bindings/bus.c +M _dbus_bindings/conn-internal.h +M _dbus_bindings/conn-methods.c +M _dbus_bindings/module.c +M dbus/_dbus.py + +commit 6963fa9cfa5be7af19b93c71d8a26c149cf2c88c +Author: Simon McVittie +Date: 2007-04-30 11:20:53 +0100 + + Implement o.fd.DBus method wrappers in Python instead of C. + This reduces the need to have _dbus_bindings.BusImplementation + and makes + peer-to-peer connections easier to implement. + +M _dbus_bindings/bus.c +M dbus/Makefile.am +M dbus/_dbus.py +A dbus/bus.py + +commit 478e03e211990d05725bfec5c44a1a1bf68eaf19 +Author: Simon McVittie +Date: 2007-04-27 12:44:45 +0100 + + dbus/proxies.py: Give Interface some properties. Vastly simplify + __getattr__ on Interface and ProxyObject + +M dbus/proxies.py + +commit f6fd7b7102ac5cfd961f4e53532eb7904f877a6e +Author: Simon McVittie +Date: 2007-04-27 12:22:54 +0100 + + Move Interface from dbus._dbus to dbus.proxies (it belongs there + really). + Make it a new-style object and document it more clearly. + +M dbus/__init__.py +M dbus/_dbus.py +M dbus/proxies.py + +commit fe50b35f867caed213d30cf0e046f51aeb275b20 +Author: Simon McVittie +Date: 2007-04-27 12:12:54 +0100 + + Remove redundant constants + +M dbus/_dbus.py + +commit a6a86fbfc299cdc61c6d013a0081c2eec878f99a +Author: Simon McVittie +Date: 2007-04-27 12:11:28 +0100 + + dbus/_dbus.py: Match NameOwnerChanged correctly + +M dbus/_dbus.py + +commit 6457e018adf4bf87a1bb4791ba5a08ad6ac6ba51 +Author: Simon McVittie +Date: 2007-04-26 15:53:06 +0100 + + test/test-service.py: Use constants for the bus name and object path + +M test/test-service.py + +commit db310619c1bd0496259cd251e6df0c83af73f3d1 +Author: Simon McVittie +Date: 2007-04-25 18:33:55 +0100 + + dbus/__init__.py: Add well-known interface, path, bus-name constants + +M dbus/__init__.py + +commit 4be15d3a5d949107c7cf51a87a02f8555791868e +Author: Simon McVittie +Date: 2007-04-25 18:30:52 +0100 + + dbus/__init__.py: Remove pseudo-tutorial from docstring, we have a + tutorial now + +M dbus/__init__.py + +commit 4a027b3240152f7b9d5eabb66c2c1a94bd5ef831 +Author: Simon McVittie +Date: 2007-04-25 18:29:48 +0100 + + _dbus_bindings/module.c: Add some useful constants + +M _dbus_bindings/module.c + +commit b6e2f84963ea0b399d50bbfeab7df046f6f24f5b +Author: Simon McVittie +Date: 2007-04-25 17:46:54 +0100 + + Make ProxyObject a new-style class, since it now has properties + +M dbus/proxies.py + +commit 26965c2bf04ffb3b101623bbe02c34f43bee9232 +Author: Simon McVittie +Date: 2007-04-25 14:07:49 +0100 + + Add object_path, bus_name and requested_bus_name properties to + ProxyObject. + There is also a placeholder for unique_bus_name, although it's + not currently + implemented. + +M dbus/proxies.py + +commit a81f1e90b293f1279ad4797753649f4264c559f3 +Author: Simon McVittie +Date: 2007-04-24 14:49:44 +0100 + + Revert the part of the previous patch that added dbus_name to signals. + Making this work correctly will also require changes to the introspect + code. + +M dbus/decorators.py + +commit e4050f2750d2fdb5c05a7d7b9cb4030b99133f13 +Author: Simon McVittie +Date: 2007-04-24 14:45:14 +0100 + + Preparation for fallback-object support: + * Let exported methods receive the path, destination and raw + message via + kwargs, as well as the sender + * Let exported signals be emitted from a variable object-path + +M dbus/decorators.py +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit ae8014c72a7d304f20d9422009f42bc48fa8f298 +Author: Simon McVittie +Date: 2007-04-24 17:45:03 +0100 + + Fix fd.o #10174: make it possible to return multiple values with + no signature. + More specifically: when a service method with no signature + synchronously + returns a tuple that is not a Struct, interpret it as a multi-valued + return, + rather than as a structure. + + This is a common Python idiom, and returning a struct makes little + sense + anyway when D-Bus lets you return multiple values. + + Returned lists are still interpreted as arrays - returning an array is + entirely sensible, and indeed likely to be common. + + Async service methods are unaffected (there is no ambiguity), and + it's still + possible to return a structure by returning a dbus.Struct with + appropriate + contents. + + https://bugs.freedesktop.org/show_bug.cgi?id=10174 + +M dbus/service.py +M test/test-client.py +M test/test-service.py + +commit 705b343c205b82c93aab0f31535d1dc99a3c0265 +Author: Simon McVittie +Date: 2007-04-24 17:39:27 +0100 + + test/test-service.py: use a constant for the interface name, + for clarity + +M test/test-service.py + +commit a2fa9563ee9e3bfca549397c0bf58946eaff37b2 +Author: Simon McVittie +Date: 2007-04-24 17:21:11 +0100 + + .gitignore: Ignore INSTALL and dbus-python-*.tar.gz + +M .gitignore + +commit 50469e3e0a04d27be1ee227518ca377e16919626 +Author: Simon McVittie +Date: 2007-04-24 14:41:45 +0100 + + Remember to include tools in dist + +M Makefile.am + +commit df42e53ab497dce7f00bd2eb3f2af1c022c0096c +Author: Simon McVittie +Date: 2007-04-24 13:51:51 +0100 + + Remove trailing whitespace in Python source + +M dbus/_dbus.py +M dbus/decorators.py +M dbus/proxies.py +M dbus/service.py + +commit 1fa0c331f5327ef1d622b55a050949845eb89b0f +Author: Simon McVittie +Date: 2007-04-24 13:50:02 +0100 + + Remove trailing whitespace in C source + +M _dbus_bindings/abstract.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-internal.h +M _dbus_bindings/message.c +M _dbus_bindings/pending-call.c + +commit cdf20eebae59e0ceb2cf8fc2660609e6c38ccebf +Author: Simon McVittie +Date: 2007-04-24 13:47:09 +0100 + + Add optional checks for coding style (mainly whitespace at the + moment). + These are on by default for git builds, off by default for releases. + +M _dbus_bindings/Makefile.am +M configure.ac +M dbus/Makefile.am +A tools/Makefile.am +A tools/check-c-style.sh +A tools/check-coding-style.mk +A tools/check-py-style.sh +A tools/check-whitespace.sh + +commit b5552a3ea76b3e229f40a06d32a5860b0e9e2217 +Author: Simon McVittie +Date: 2007-04-24 13:05:17 +0100 + + Refactor build system: + * Use autoreconf to simplify autogen.sh considerably + * Use AC_CONFIG_MACRO_DIR and aclocal -I to pick up macros from m4/ + * Drop acinclude.m4 in favour of putting our macros in m4/ + +M Makefile.am +D acinclude.m4 +M autogen.sh +M configure.ac +A m4/Makefile.am +A m4/am-check-pymod.m4 +A m4/am-check-python-headers.m4 +A m4/dbus-py-add-rst2htmlflag.m4 +A m4/jh-add-cflag.m4 + +commit 29fae4fdfd02cc2dd4c896a2cb271d9a3597623c +Author: Simon McVittie +Date: 2007-04-24 12:27:18 +0100 + + test/run-with-tmp-session-bus.sh: untabify, remove trailing whitespace + +M test/run-with-tmp-session-bus.sh + +commit d6b644f9317346211c94a2ae75b77ca9369a7088 +Author: Simon McVittie +Date: 2007-04-24 12:26:42 +0100 + + test/test-client.py: untabify + +M test/test-client.py + +commit 35808b1bae43f846fdbcb740c359c66977231518 +Author: Simon McVittie +Date: 2007-04-24 12:24:02 +0100 + + dbus/service.py: untabify + +M dbus/service.py + +commit 7207bc9f616b2401de609b36dc774bbe79fa7166 +Author: Simon McVittie +Date: 2007-04-24 12:23:47 +0100 + + configure.ac: untabify + +M configure.ac + +commit c2aa57fc64f32e0c197320b050b93e71949edd53 +Author: Simon McVittie +Date: 2007-04-24 12:23:24 +0100 + + _dbus_bindings/message.c: untabify + +M _dbus_bindings/message.c + +commit a7110d5ee20f04f17346079a6a824a7c017fe124 +Author: Simon McVittie +Date: 2007-03-02 18:46:12 +0000 + + Implement ExportedGObject, a convenience class to export GObjects + on the bus. + This is non-trivial because dbus.service.Object and GObject both use + metaclasses, so we need to implement a metaclass inheriting from + both their + metaclasses - it might as well go in dbus-python to avoid everyone + having to + reinvent this solution. + +A dbus/gobject_service.py + +commit cfb1ea5f32a5ab77078ce184cb13602f2e28fec1 +Author: Simon McVittie +Date: 2007-03-02 18:43:09 +0000 + + * dbus.service.Object: don't let the user try to export objects on + the local + path reserved by libdbus/dbus-daemon, or on an invalid path. + * BusName: don't even try to claim an invalid bus name either. + +M dbus/service.py + +commit 5ee2e05d5056584d589991f5d5fd0d22df598676 +Author: Simon McVittie +Date: 2007-03-02 18:41:01 +0000 + + * ProxyObject: allow named_service to be None, in preparation for + peer-to-peer + connections. If so, never attempt to follow name owner changes + (doesn't make + sense when you're talking directly to the peer). + * _ProxyMethod: allow interface to be None, for when a method call + is made + on a ProxyObject without going via a dbus.Interface. + +M dbus/proxies.py + +commit f2fda30b23b0176dd314329050127f61b5e92255 +Author: Simon McVittie +Date: 2007-03-02 18:38:00 +0000 + + SignalMatch: check that interface, member and sender are either valid, + or None + +M dbus/_dbus.py + +commit 91d0a865d574325328b67ec8c5dab9b841b9218c +Author: Simon McVittie +Date: 2007-03-02 18:29:34 +0000 + + SignalMatch: remove assorted commented-out debug messages + +M dbus/_dbus.py + +commit bfc541fad2dec718abce406caa0285b1e40c4958 +Author: Simon McVittie +Date: 2007-03-02 18:13:23 +0000 + + Remove FIXME comment - I think the current behaviour is correct. + +M dbus/service.py + +commit cf48b799ebdcaf7dca0b6f729516b413be21e989 +Author: Simon McVittie +Date: 2007-03-02 18:12:47 +0000 + + * Don't let the user call methods on the reserved local path - + we'll get + kicked off the bus if they do. + * Don't try to introspect the reserved local path - same problem. + * Do earlier validation of bus names etc. in client proxies. + +M dbus/proxies.py + +commit f1e0a64b9f02a77cfd468f146ed3f398b2c1c8bc +Author: Simon McVittie +Date: 2007-02-21 15:04:20 +0000 + + If send_with_reply() returns TRUE but with pending call NULL, + cope gracefully. + This is a workaround for the fact that trying to use the object path + /org/freedesktop/DBus/Local in a message header (e.g. when + introspecting + trackerd with dbus-inspector) causes us to be disconnected by the + bus daemon. + +M _dbus_bindings/conn-methods.c + +commit 8dce2df1ceacffb2aa6e2cc8b1d4b58ee95ac5b1 +Author: Simon McVittie +Date: 2007-02-21 12:31:15 +0000 + + Don't examine args for functions declared METH_NOARGS. + It's not guaranteed to be non-NULL, and Python checks there are + no arguments + so we don't have to. + +M _dbus_bindings/conn-methods.c + +commit 4f88700588d80861c8520e56407d3a40d5bd86e6 +Author: Simon McVittie +Date: 2007-02-19 14:17:08 +0000 + + dbus/_dbus.py: When an exception is raised by a signal handler, + print it to stderr + +M dbus/_dbus.py + +commit a79f8dacbf86efce563cc29104bbacecb5ef9739 +Author: Simon McVittie +Date: 2007-02-13 17:54:55 +0000 + + Update NEWS file for 0.80.2 (not actually present in the release, + but at least it'll be in the next release's NEWS file) + +M NEWS + +commit 22f2a483aa45720711b42fa8ce4ddf2d9fdbaec9 +Author: Simon McVittie +Date: 2007-02-13 17:44:38 +0000 + + Set released flag back to 0 + +M configure.ac + +commit 728e8f47d884bdff66106b89cc1d803fa5f30456 +Author: Simon McVittie +Date: 2007-02-13 16:54:51 +0000 + + Release version 0.80.2 + +M configure.ac + +commit 87dc3d5807ba12c6396dbcb1acdebb8f453e8fcd +Author: Simon McVittie +Date: 2007-02-07 20:46:17 +0000 + + Actually commit the numerous copyright-statement changes. + +M COPYING +M Makefile.am +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-internal.h +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/debug.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/float.c +M _dbus_bindings/generic.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message-internal.h +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/types-internal.h +M _dbus_bindings/validation.c +M _dbus_glib_bindings/module.c +M dbus/lowlevel.py +M dbus/mainloop/__init__.py +M doc/tutorial.txt.in +M include/dbus-python.h +M test/cross-test-client.py +M test/cross-test-server.py +M test/crosstest.py +M test/test-standalone.py + +commit 1f9f29452352baf103fd6620eb0cd8315f8b736d +Author: Simon McVittie +Date: 2007-02-07 17:05:29 +0000 + + For files solely owned by Collabora Ltd., additionally allow use + under LGPL 2.1. + Also: + * split out AFL, GPL from COPYING into separate files, and add LGPL. + * update copyright year in recently touched files + +A COPYING.AFL-2.1 +A COPYING.GPL-2 +A COPYING.LGPL-2.1 + +commit 278b57d9f4a1aed4f0296b17a94bde2a36145a45 +Author: Simon McVittie +Date: 2007-02-07 13:15:17 +0000 + + Audit tp_dealloc callbacks to make sure they preserve the exception + state. + * Connection: use PyErr_Fetch and PyErr_Restore to preserve exception + state + * MainLoop: add a comment indicating that the "free" callback needs + to do the + same if it might alter the exception state + +M _dbus_bindings/conn.c +M _dbus_bindings/mainloop.c + +commit ffe3b55b4b293c5dfb36de8cf2dc2b91d09a9f0d +Merge: 5135a35 66fb274 +Author: Simon McVittie +Date: 2007-02-07 13:00:33 +0000 + + Merge + git+ssh://people.freedesktop.org/home/smcv/public_html/git/dbus-python/ + +commit 5135a35677e25c473db0e8a463f97c15359c9e34 +Author: Simon McVittie +Date: 2007-02-07 12:50:48 +0000 + + Fix memory leak where Struct, _LongBase, _StrBase, String leaked + their __dict__ on deallocation. + * Use a fixed-size struct for String (unicode objects are in fact + fixed-size) + and store its variant_level that way. + * Don't store Struct, _LongBase, _StrBase variant_level and Struct + signature + in a __dict__, but instead have a global dict mapping object IDs + to variant + levels, and a global dict mapping Struct IDs to signatures. This + is a bit + strange, but easier than correctly freeing the __dict__ (which + is stored + at the end of a variable-length struct, so somewhat hard to get at). + * With this change, allocating objects in a loop no longer leaks + memory, and + neither does the test case supplied by Luka Renko. + +M _dbus_bindings/abstract.c +M _dbus_bindings/containers.c +M _dbus_bindings/message-append.c +M _dbus_bindings/string.c +M _dbus_bindings/types-internal.h + +commit 870227fafd9c976a0354b02aff6052ba24234e91 +Author: Simon McVittie +Date: 2007-02-05 16:21:13 +0000 + + Close a couple of reference leaks in String (there's another + somewhere, but I can't find it) + +M _dbus_bindings/string.c + +commit c04456ff1b24de8695cda14f91e8886ca9c0bf0f +Author: Simon McVittie +Date: 2007-02-05 15:18:39 +0000 + + Don't leak memory in Struct repr() + +M _dbus_bindings/containers.c + +commit 192bd48b8a17e4f62400b64e037df22c3b47de88 +Author: Simon McVittie +Date: 2007-02-05 15:18:14 +0000 + + Don't leak memory in _StringBase and _LongBase repr() + +M _dbus_bindings/abstract.c + +commit 630f912b2155e6328a3fa48deb832f5c3d114b94 +Author: Simon McVittie +Date: 2007-02-05 13:18:19 +0000 + + Switch _IntBase back to using generic alloc/free implementation + rather than half-participating in the int free list (which would + result in _IntBase instances leaking) + +M _dbus_bindings/abstract.c + +commit 95c0d3618041e8c8f9173a3eb8e8ddc93c456952 +Author: Simon McVittie +Date: 2007-02-05 13:17:12 +0000 + + Fix a couple of memory leaks - D-Bus signature strings, and decoded + Unicode objects + +M _dbus_bindings/message-get-args.c + +commit 99e0758b1d4f958e5753d51e843f1254e15b93b2 +Author: Simon McVittie +Date: 2007-01-31 13:47:49 +0000 + + _dbus_bindings/pending-call.c: Fix memory leak of one Message per + method call. + Also fix a leak of references to Py_None (unlikely to be a practical + problem, + but best to be correct). + +M _dbus_bindings/pending-call.c + +commit 66fb2745189037ba634cc3574f174f26e53a9be6 +Author: Simon McVittie +Date: 2007-01-31 13:27:16 +0000 + + Fix a leak of references to Py_None in slightly pathological cases + (should never be a problem in practice, but correctness is good) + +M _dbus_bindings/pending-call.c + +commit 9285b0648419a6860ca274d381cdb2924f85fdd2 +Author: Simon McVittie +Date: 2007-01-31 13:07:49 +0000 + + _pending_call_notify_function: stop leaking a Message per call + +M _dbus_bindings/pending-call.c + +commit c0c48abc99e66998b4c81436a8f6eca58f93cef4 +Author: Simon McVittie +Date: 2007-01-25 12:59:39 +0000 + + configure.ac: Only use -Werror if user passes --enable-Werror to + configure. + Also improve clarity of help message for --enable-html-docs. + +M configure.ac + +commit d7c11cccfcdc3ef94f183d79203fac136e2c3494 +Author: Simon McVittie +Date: 2007-01-25 12:49:57 +0000 + + doc/tutorial.txt.in: Add copyright and license (GPL2/AFL2.1, like + the code) + +M doc/tutorial.txt.in + +commit dc6b66210bda929f92524ef10f5c3edbb3cb495c +Author: Simon McVittie +Date: 2007-01-25 12:43:57 +0000 + + COPYING: Remove information about files we no longer have + +M COPYING + +commit 00ffd01f3186bf7eab88a5408daa59d162efdf70 +Author: Simon McVittie +Date: 2007-01-25 12:43:13 +0000 + + test/, include/: remove accidentally duplicated lines from license + statement + +M include/dbus-python.h +M test/cross-test-client.py +M test/cross-test-server.py +M test/crosstest.py +M test/test-client.py +M test/test-service.py +M test/test-signals.py +M test/test-standalone.py + +commit 41694b4df5c1dbf745e5ddd443571d5cb67d74b3 +Author: Simon McVittie +Date: 2007-01-25 12:38:53 +0000 + + dbus, _dbus_bindings, _dbus_glib_bindings: remove accidentally + duplicated lines in license statement + +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/conn-internal.h +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/debug.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/float.c +M _dbus_bindings/generic.c +M _dbus_bindings/int.c +M _dbus_bindings/mainloop.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message-internal.h +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/types-internal.h +M _dbus_bindings/validation.c +M _dbus_glib_bindings/module.c +M dbus/__init__.py +M dbus/_dbus.py +M dbus/_expat_introspect_parser.py +M dbus/decorators.py +M dbus/glib.py +M dbus/lowlevel.py +M dbus/mainloop/glib.py +M dbus/proxies.py +M dbus/service.py + +commit 3706648c6ba07d2781fb9723eddc202a7e2b8a72 +Author: Simon McVittie +Date: 2007-01-24 20:29:17 +0000 + + Use AC_PREREQ(2.59c) to make sure we can use docdir, which is + relatively new + +M configure.ac + +commit 4c9b10a511f9465ee87e4f87065445c04a34d7e5 +Author: Simon McVittie +Date: 2007-01-24 16:37:03 +0000 + + Reset released flag + +M configure.ac + +commit 130d1a59220a921af7cc7738306804a6f8878062 +Author: Simon McVittie +Date: 2007-01-24 16:17:43 +0000 + + Version 0.80.1, the "oops" release. Install dbus/_version.py so + dbus.__version__ exists again. + +M NEWS +M configure.ac +M dbus/Makefile.am +M dbus/_version.py.in + +commit 6e6b4cd1d7ade85612872d94374d722531f2e3f9 +Author: Simon McVittie +Date: 2007-01-24 16:03:37 +0000 + + Clear "released" flag after release + +M configure.ac + +commit 876f343d4eb39519ca155a4add1483d4f6ced641 +Author: Simon McVittie +Date: 2007-01-24 16:01:09 +0000 + + Relax dbus requirement to 0.93, to be nice to Ubuntu 6.10 and Fedora + Core 6 users. Release version 0.80.0 + +M configure.ac + +commit 1ad24fa7b36a333a0a4e0ce1f0afd2b201f09245 +Author: Simon McVittie +Date: 2007-01-24 14:55:43 +0000 + + Remove unnecessary "..." in AC_MSG_CHECKING; correct quoting in + AC_MSG_RESULT and tests + +M configure.ac + +commit 3edafe1f009d0e228109368dcec3ba3da2d559a1 +Author: Simon McVittie +Date: 2007-01-24 14:37:32 +0000 + + Clear "released" flag. Improve checking for rst2html and epydoc. + +M configure.ac + +commit 057317ea759323f49133351e997ce7b892394889 +Author: Simon McVittie +Date: 2007-01-24 14:31:54 +0000 + + Update NEWS, README for 0.80.0 + +M NEWS +M README + +commit bdf3c3a8ca30149b8d047ac0437858a47927f37e +Author: Simon McVittie +Date: 2007-01-24 14:31:29 +0000 + + Remove from EXTRA_DIST files we'd already be distributing + +M Makefile.am + +commit 36deedcc043fb5abde7cbb432b3a3b24a5031da0 +Author: Simon McVittie +Date: 2007-01-24 14:13:50 +0000 + + Add Makefile target maintainer-update-website to update + d.fd.o/doc/dbus-python + (to use this target, configure your fd.o username, if not the same as + your local username, in ~/.ssh/config). + Move API_CHANGES.txt, HACKING.txt to doc/ directory. + Tweak documentation generation so deprecated stuff isn't documented. + +M Makefile.am +M dbus/__init__.py +M dbus/_dbus.py +R100 API_CHANGES.txt doc/API_CHANGES.txt +R088 HACKING.txt doc/HACKING.txt + +commit 0035c926fd188d9458a4b23275fcb277b26abfbd +Author: Simon McVittie +Date: 2007-01-24 12:12:39 +0000 + + Install dbus-python.h in $includedir/dbus-1.0/dbus rather than + $includedir for consistency with libdbus-glib and libdbus + +M Makefile.am + +commit 6708a7bb677ac91cb1190f5f6761e2136f6dc779 +Author: Simon McVittie +Date: 2007-01-24 12:04:19 +0000 + + Automatically detect whether various desirable rst2html options are + actually supported, using a modified version of JH_ADD_CFLAG. Also + allow HTML documentation building to be switched off. + +M Makefile.am +M acinclude.m4 +M configure.ac + +commit 5e31fb2bfc9ea3e39e13abc519fade6e0322c864 +Author: Simon McVittie +Date: 2007-01-22 18:52:00 +0000 + + Build pre-release version 0.79.94 (= 0.80rc4) + +M configure.ac + +commit 7ab85ec3ad175ed8631409e2fb216162fda70d67 +Author: Simon McVittie +Date: 2007-01-22 18:34:11 +0000 + + Alter Makefile.am, configure.ac to recurse into subdirs for previous + change to take effect + +M .gitignore +M Makefile.am +M configure.ac + +commit 625bfaac68f6c7afd85d62752e34fc8e00405790 +Author: Simon McVittie +Date: 2007-01-22 18:26:36 +0000 + + Split up Makefile.am between subdirectories + As well as being conventional, this seems to be necessary to avoid + having + dbus_py_test.so installed, while still having it be a Libtool + shared library + (noinst libraries are helpfully made static). + +A _dbus_bindings/Makefile.am +A _dbus_glib_bindings/Makefile.am +A dbus/Makefile.am +A examples/Makefile.am +A test/Makefile.am + +commit 6edb71ddccce139f6c7de1e43f885fed37f58b1b +Author: Simon McVittie +Date: 2007-01-22 16:50:19 +0000 + + API_CHANGES.txt, NEWS: update for 0.79.94 (= 0.80rc4) + +M API_CHANGES.txt +M NEWS + +commit b693df256198cd58c71e97531aa4169999bfd2d8 +Author: Simon McVittie +Date: 2007-01-22 16:49:52 +0000 + + configure.ac: When building a non-release version, compile with + -Werror + +M configure.ac + +commit 795927e72a9b5e0a14ea7125c31972d2fc3501dc +Author: Simon McVittie +Date: 2007-01-19 12:31:56 +0000 + + Add a "released" flag to configure.ac: if not 1, append the date to + the version. + When making official releases please do the following: + * set dbus_python_released to 1 and set the new version + * make the release tarball (make distcheck) + * commit, tag + * change dbus_python_released back to 0 and commit again + +M configure.ac + +commit 43c48b9c7fdbb5741daa024df9e7a319d1993dac +Author: Simon McVittie +Date: 2007-01-17 13:06:33 +0000 + + dbus/proxies.py: Finish implementing deferred methods so they can + be async. + + * Queue up async methods and execute them when introspection finishes, + instead + of blocking on the introspection operation (heavily based on patch + by J5) + * Rename DeferedMethod (sic) to spell Deferred correctly, and + rename to + _DeferredMethod (also _ProxyMethod) since these classes are not + public API + * Make it safe to keep a reference to a DeferredMethod and call + it with + differing arguments: + meth = proxy.DoStuff + meth(1, reply_handler=on_reply, error_handler=on_error) + meth(2, reply_handler=on_reply, error_handler=on_error) + * Make it safe to keep references to DeferredMethod even after + introspection + has finished - if called after introspection finishes, silently + do an + immediate call + * Add some locking to avoid subtle failures if one thread appends + to the pending introspect queue at the same time another thread gets + introspection results back - ProxyObject and friends should now be + threadsafe (I think) + +M dbus/proxies.py + +commit 4dbee87fbe9dd7abb56d8d150d8c8ae7bd01f261 +Author: Simon McVittie +Date: 2007-01-17 12:28:38 +0000 + + dbus/service.py: cope with exceptions with no __module__ + (thanks Phil Thompson, ) + +M dbus/service.py + +commit cc4dfc18c7fe0843b5e118d35a94ca9cca563f98 +Author: Simon McVittie +Date: 2007-01-17 12:27:51 +0000 + + DBusGMainLoop: avoid reference leak on success + (thanks Phil Thompson, ) + +M _dbus_glib_bindings/module.c + +commit 47860b5c25c823587e4e06636acc926b252fe114 +Author: Simon McVittie +Date: 2007-01-16 19:52:45 +0000 + + Add regression test for main loop failure handling (a main loop that + never works) + + Also run tests with DBUS_FATAL_WARNINGS and ulimit -c unlimited so + they dump + core at the slightest provocation. + +M Makefile.am +A test/dbus_py_test.c +M test/run-test.sh +A test/test-unusable-main-loop.py + +commit 916df7703d828afec95635d309ca83bc1c05fd98 +Author: Simon McVittie +Date: 2007-01-16 19:51:28 +0000 + + examples: Don't load a main loop when only making blocking calls + +M examples/example-client.py +M examples/list-system-services.py + +commit f0deb687acad02173c20a0dc644323774b24dc0e +Author: Simon McVittie +Date: 2007-01-16 19:38:00 +0000 + + When running without a main loop, don't make introspection fail. + + Also change send_message_with_reply() to not demand a main loop + by default + (since you can call block() on the returned object, like blocking + introspection + does). + +M _dbus_bindings/conn-methods.c +M dbus/proxies.py + +commit 7d70b07e62d579ce85572a3e1ebb92f42461a185 +Author: Simon McVittie +Date: 2007-01-16 19:36:05 +0000 + + conn.c: fix Connection setup in absence of main loop, and error + handling + + * Only set up a main loop if we actually have one (not None) + * Don't double-close the DBusConnection (causing an assertion in + libdbus) if + we somehow fail to set up the main loop. Thanks to tsuraan + for the bug report. + +M _dbus_bindings/conn.c + +commit 6d7356140055082a30090161c586b4575f8f0fa7 +Author: Simon McVittie +Date: 2007-01-16 18:08:04 +0000 + + Correctly don't build HTML docs if rst2html is not found + +M configure.ac + +commit b33efe312c8d89ecc6e2ba9f075d2d0a9e28c3e1 +Author: Simon McVittie +Date: 2007-01-16 17:41:45 +0000 + + Switch types from int to Py_ssize_t to be compatible with Python + 2.5 on 64-bit archs + +M _dbus_bindings/conn-methods.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c + +commit 4d7fac530ce82c3dc888248234b955c04c364ada +Author: Simon McVittie +Date: 2007-01-16 17:24:00 +0000 + + Always install text documentation, even if we're not able to build + the HTML + +M Makefile.am + +commit 597d278a3973ad411e345ab8938adf6c582da42d +Author: Simon McVittie +Date: 2007-01-16 17:23:25 +0000 + + bytes.c, string.c: Don't mention get_object_by_unique_name in + docstrings, it no longer exists + +M _dbus_bindings/bytes.c +M _dbus_bindings/string.c + +commit d723afa11282cc694342a0043cdc8303747c88a7 +Author: Simon McVittie +Date: 2007-01-16 17:19:03 +0000 + + When running make clean, also get rid of the generated API docs + (now passes make distcheck DISTCHECK_CONFIGURE_ARGS=--enable-api-docs) + +M Makefile.am + +commit 0557d5bdcf90dc79ed3662144d8ecd1df28e5dcf +Author: Simon McVittie +Date: 2007-01-16 17:09:10 +0000 + + Remove generated HTML documentation on distclean + +M Makefile.am + +commit 3504ac8bc098b5872be747c151f304bbe80d2131 +Author: Simon McVittie +Date: 2007-01-16 17:04:37 +0000 + + Remove get_object_by_unique_name again, and replace with a + better-thought-out version of get_object + + - Remove get_object_by_unique_name (introduced in 0.80rc1) - J5's + right, the + name is misleading + - Make get_object *not* follow name changes by default (a return + to pre-0.80 + behaviour, and the same as 0.80rc1's get_object_by_unique_name()) + - Add keyword argument follow_name_owner_changes (default is False): + if True, + it will follow name owner changes (like 0.80rc1's get_object() + always did) + - Implement with modifications to ProxyObject so it resolves the + unique name + on construction, if required (activating it if necessary) + +M dbus/_dbus.py +M dbus/proxies.py + +commit e8d766e1b2d5013e3f2c0a95d43b1dcb5eb00044 +Author: Simon McVittie +Date: 2007-01-16 17:00:00 +0000 + + Ensure we put the right number of items in a struct or message and + add test cases. + + This avoids us getting kicked off the bus when trying to put the wrong + number of things in a struct - this used to happen, but was masked + by the fact + that the tests ran with service activation, so the service was just + killed and + reactivated. Forthcoming changes to get_object make this automatic + reactivation + not happen (messages will be directed to the unique name by default, + so + stateful communication can work). + +M _dbus_bindings/message-append.c +M test/test-standalone.py + +commit bd2baf2aad6a7f5ecf0bf7e867e74077cf733cd6 +Author: Simon McVittie +Date: 2007-01-16 15:05:31 +0000 + + test/run-test.sh: Re-order to run the simpler tests (standalone, + examples, cross tests) first + +M test/run-test.sh + +commit c7fa08a7a7cc6ae3811b1164b0fdd627a9377e43 +Author: Simon McVittie +Date: 2007-01-16 14:44:01 +0000 + + Write some more of the tutorial + +M doc/tutorial.txt.in + +commit e018fa3f6a7e4e0da334453c81e3bde22da46fe1 +Author: Simon McVittie +Date: 2007-01-16 12:08:05 +0000 + + Comment on why we're putting the client at path /Test + +M test/cross-test-client.py + +commit c98c7742c13ff38998bbc6b6acca390a529e9c7f +Author: Simon McVittie +Date: 2007-01-16 11:40:47 +0000 + + Use autoconf's usual directory for docs + +M Makefile.am + +commit 24d8be176996913853b01f0e3ed1d33082640dec +Author: Simon McVittie +Date: 2007-01-15 20:24:59 +0000 + + Generate HTML docs from reStructuredText if rst2html is available + +M Makefile.am +M configure.ac + +commit a9575bf47b9ba5bc02ad5280fe35652758c0d00e +Author: Simon McVittie +Date: 2007-01-15 20:23:48 +0000 + + reStructuredText syntax corrections + +M API_CHANGES.txt +M HACKING.txt +M NEWS +M README + +commit cd5719adbf6cafb53fb3dd19c141ad312729c83c +Author: Simon McVittie +Date: 2007-01-15 20:22:52 +0000 + + Ignore generated documentation + +M .gitignore + +commit 6053bac21757a0d87abd0c50135f6c783fdf63b9 +Author: Simon McVittie +Date: 2007-01-15 19:15:20 +0000 + + configure.ac: don't divert autotools cruft into autotools/, it's + probably more trouble than it's worth (fd.o#9630); .gitignore: + adjust accordingly + +M .gitignore +M configure.ac + +commit 02f962921e831a710e7b1566ec5d4c0b84a15d91 +Author: Simon McVittie +Date: 2007-01-15 19:09:04 +0000 + + Makefile.am: ship example-async-client so it can be used as a test + +M Makefile.am + +commit 618e13ee5bdce6dd129600a698910f5edb7ab4db +Author: Simon McVittie +Date: 2007-01-10 13:11:33 +0000 + + Add half-written tutorial. Fix reStructuredText syntax in + documentation, and build HTML if we have rst2html or rst2html.py. + Distribution packagers may want to build-depend on docutils, and + configure with --docdir=... if their distribution would usually use + a location other than PREFIX/share/doc/dbus-python - for instance + Debian/Ubuntu should use --docdir=/usr/share/doc/python-dbus. + +A doc/tutorial.txt.in + +commit bde53f1cf59b743d5e38b6ac4fbdf348bdf773db +Author: Simon McVittie +Date: 2007-01-10 13:05:23 +0000 + + Add special case to serialization: objects with a __dbus_object_path__ + attribute are serialized as that object path. Add that attribute to + ProxyObject, dbus.Interface and dbus.service.Object. + +M _dbus_bindings/abstract.c +M _dbus_bindings/message-append.c +M _dbus_bindings/types-internal.h +M dbus/_dbus.py +M dbus/proxies.py +M dbus/service.py +M test/test-standalone.py + +commit 92e8cc8ff3cb87af3e94bc455d3be057e98846d3 +Author: Simon McVittie +Date: 2007-01-10 12:45:06 +0000 + + Remove old .cvsignore files + +D dbus/.cvsignore +D examples/.cvsignore + +commit 984b7fc404a89b61f5efefb2a82d203a6b4fd143 +Author: Simon McVittie +Date: 2007-01-09 16:49:58 +0000 + + Validate that the signature on an Array or Dict has the right number + of complete types + +M _dbus_bindings/containers.c + +commit 6e4a93545a40a13af7308b97e435921a0eee7805 +Author: Simon McVittie +Date: 2007-01-09 15:30:22 +0000 + + When putting a ByteArray into a variant array, serialise it as + an array of variants containing byte, not an array of variants + containing string + +M _dbus_bindings/message-append.c +M test/test-standalone.py + +commit 93faf8793f271d91fbc413f1c9374328605bcda8 +Author: Simon McVittie +Date: 2007-01-09 15:27:52 +0000 + + Improve documentation of type conversion from D-Bus to Python + +M _dbus_bindings/message-get-args.c + +commit e5cef62c8ed04f5842257653bc6ec70abbdd20bb +Author: Simon McVittie +Date: 2007-01-09 15:27:02 +0000 + + dbus.Interface, dbus.ProxyObject: add get_dbus_method(), which can + be used to call awkwardly-named methods like __getattr__ + +M dbus/_dbus.py +M dbus/proxies.py +M test/test-client.py + +commit ee11236f45c9aa354136e6e5d2ec1c4490bc6657 +Author: Simon McVittie +Date: 2007-01-09 14:53:55 +0000 + + Improve docstrings for String and UTF8String explaining how to get + UTF8String from the API. + +M _dbus_bindings/string.c + +commit d75fec04ba79b46872801c6132afad7b9f192c94 +Author: Simon McVittie +Date: 2007-01-09 14:53:16 +0000 + + Subscripting a ByteArray now gives 1-character strings again (for + least astonishment). Also document how to get a ByteArray from the API + +M _dbus_bindings/bytes.c + +commit b68d891998983ab94e68555855d10f85a3dca019 +Author: Simon McVittie +Date: 2007-01-09 14:29:46 +0000 + + Correct usage in example-async-client: you need to use example-client + (or kill(1) of course) to shut down the example service + +M examples/example-async-client.py + +commit 26ce68b8de3f48187091d3686cb30b75375b84d0 +Author: Simon McVittie +Date: 2007-01-09 14:05:28 +0000 + + Add an example of asynchronous calls. Run the examples during + 'make check'. + +A examples/example-async-client.py +M examples/example-client.py +M examples/example-service.py +M examples/example-signal-recipient.py +M test/run-test.sh + +commit 9ede20248d690d9bb2cb9fba6b75955770930a94 +Author: Simon McVittie +Date: 2007-01-09 14:04:49 +0000 + + Don't require a main loop unless async calls, signal connections or + exported objects are actually made. (Increases backwards compatibility + with Pyrex-dbus-python) + +M _dbus_bindings/conn-internal.h +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/module.c +M dbus/_dbus.py + +commit 336cfd395976627b9c758a48f7ec7db275963bc9 +Author: Simon McVittie +Date: 2007-01-09 13:03:27 +0000 + + Accept keyword argument introspect=False to Bus.get_object(), + Bus.get_object_by_unique_name() to suppress introspection - off by + default, but necessary to work around broken service implementations + which fail to reply to introspection. + Thanks to Ulisses Furquim for the patch. + +M dbus/_dbus.py + +commit 88011f8e449d92959f83e304d8b6b2db44ec02bc +Author: Simon McVittie +Date: 2007-01-09 12:59:31 +0000 + + Stop trying to get macros from the autotools directory (no longer + needed) + +M configure.ac + +commit adf16bd849e1ebf98f65e288bc42956810a3e2eb +Author: Simon McVittie +Date: 2007-01-09 12:47:26 +0000 + + Remove extra M4 macros (J5 added them to acinclude.m4 instead) + +D autotools/as-ac-expand.m4 +D autotools/jhflags.m4 +D autotools/python.m4 + +commit 2a100a94dc4db5174244b9dac89f4ca5c1083103 +Author: Simon McVittie +Date: 2007-01-09 12:46:53 +0000 + + Remove setup.py (no longer used in favour of autotools) + +D setup.py + +commit d0004b6162a18c3d9f02dbc4404f8f452f1c3e79 +Author: John (J5) Palmieri +Date: 2007-01-03 17:35:57 -0500 + + fix autogen.sh to run all the correct steps that jhbuild expects + + * copy autogen.sh from D-Bus core + * add JH_ADD_CFLAG, AM_CHECK_PYTHON_HEADERS and AM_CHECK_PYMOD + m4 macros + to acinclude.m4 + +A acinclude.m4 +M autogen.sh + +commit 5b8c9eb452b78ed56b395193f6989ad87eae111b +Author: Simon McVittie +Date: 2006-12-21 19:51:54 +0000 + + Improve various type docstrings + +M _dbus_bindings/abstract.c +M _dbus_bindings/bus.c +M _dbus_bindings/bytes.c +M _dbus_bindings/containers.c +M _dbus_bindings/generic.c +M _dbus_bindings/int.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c +M _dbus_bindings/module.c +M _dbus_bindings/pending-call.c +M _dbus_bindings/signature.c +M _dbus_bindings/string.c +M _dbus_bindings/validation.c + +commit b2e5a27a119ca7b94cd8a343a163bc6639f7c8f9 +Author: Simon McVittie +Date: 2006-12-21 18:39:51 +0000 + + Fix recommendation given by exception message bringing it into sync + with current API (spotted by Phil Thompson) + +M _dbus_bindings/conn.c + +commit 7f7262c8d6b1e3aa6cdc541ac0cdb275f9e68501 +Author: Simon McVittie +Date: 2006-12-19 17:48:34 +0000 + + Makefile.am: if in a git checkout, generate the ChangeLog (correctly) + +M Makefile.am + +commit 06e9507ebca33369c106b616f948fe6af4fe71c9 +Author: Simon McVittie +Date: 2006-12-19 17:44:35 +0000 + + NEWS, README: 0.80rc3, a.k.a. 0.79.93 + +M NEWS +M README + +commit d62626c19c32348c28b90e269c47635a421247f3 +Author: Simon McVittie +Date: 2006-12-19 17:42:57 +0000 + + .gitignore: ignore the generated Makefile + +M .gitignore + +commit 75a897710ffafb1fc4df17460784829df844666f +Author: Simon McVittie +Date: 2006-12-19 17:37:11 +0000 + + Makefile.am: if in a git checkout, generate the ChangeLog + +M Makefile.am + +commit 6020c7f6252833c2d5bf890c68335ee4cc6f777c +Author: Simon McVittie +Date: 2006-12-19 15:57:11 +0000 + + dbus-python.h: Alter header comment, use a better cpp define name + for the multiple-inclusion guard + +M include/dbus-python.h + +commit 75111a7da5f12f3f01d736694158ea266926139b +Author: Simon McVittie +Date: 2006-12-19 15:43:57 +0000 + + Remove old introspect_parser from Makefile.am too + +M Makefile.am + +commit 550390810f9ee63a3f251e854f3e234c6a948436 +Author: Simon McVittie +Date: 2006-12-19 15:17:12 +0000 + + Remove old libxml2-based introspection parser + +D dbus/introspect_parser.py + +commit d6bfbdd4a270a0b2421e8cba566805211b711c77 +Author: Simon McVittie +Date: 2006-12-19 15:16:43 +0000 + + Include the cross-test in 'make check' + +M test/run-test.sh + +commit 432694be74b0a6bfb5336e4fa493958b1bf1ac4e +Author: Simon McVittie +Date: 2006-12-19 15:16:22 +0000 + + Add missing _expat_introspect_parser.py; fix cross-test to work for + out-of-tree builds + +M Makefile.am + +commit 0bccb0f1fd68b224e7aee6d21aef8e36cdc8d980 +Author: Simon McVittie +Date: 2006-12-19 15:15:01 +0000 + + Remove Makefile (auto-generated since switching to autotools) + +D Makefile + +commit b3c9b4c65aaefc6c940793e00fcdb60831367d10 +Author: Simon McVittie +Date: 2006-12-19 14:45:16 +0000 + + Add an Expat-based introspect parser, and use it instead of libxml2. + (Removes dependency on libxml2.) + +A dbus/_expat_introspect_parser.py +M dbus/proxies.py + +commit 164f38ea01187c1bbe9606dde81e09efd62362e5 +Author: Simon McVittie +Date: 2006-12-19 14:24:45 +0000 + + Pass introspection XML around as UTF-8, rather than decoding it + to Unicode + during unmarshalling and re-encoding it for libxml2. + +M dbus/introspect_parser.py +M dbus/proxies.py + +commit 956a5c9e47e9504b67685a6bf582afd04c613fd3 +Author: Simon McVittie +Date: 2006-12-19 14:21:10 +0000 + + Respect utf8_strings, byte_arrays options when calling methods + asynchronously. + + Also make it possible to fail the async call tests in test-client, + and add a test case for utf8_strings in async use. + +M dbus/proxies.py +M test/test-client.py + +commit b4845467ec4e381f07dadf48ce67a7b02ac46618 +Author: Simon McVittie +Date: 2006-12-19 14:05:15 +0000 + + Do cross-product of options in more obvious way + +M test/test-client.py + +commit e6eb7b5307da2a446e1c8c6b0cb6b11fc6705b00 +Author: Simon McVittie +Date: 2006-12-18 20:33:56 +0000 + + Switch to autotools and test with Python 2.5 as well as 2.4. + + In the process: + + HACKING.txt: update + include/dbus-python.h: add some typedefs to make it saner + bus.c, conn.c, conn-methods.c: further alter docstrings to keep + epydoc happy + exceptions.c: create exceptions in a more longwinded way for Python + 2.5 compatibility + message-get-args.c, bus/__init__.py: tweak docstrings + dbus/introspect_parser.py: make docstring valid reStructuredText + run-test.sh: simplify, since configure now does some of the work + test/*.py: use paths from run-test.sh, cope with out-of-tree builds + test-standalone.py: carry out additional sanity checks + +M .gitignore +M HACKING.txt +D MANIFEST.in +M Makefile +A Makefile.am +A README +M _dbus_bindings/bus.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c +M _dbus_bindings/exceptions.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/module.c +A autogen.sh +A autotools/as-ac-expand.m4 +A autotools/jhflags.m4 +A autotools/python.m4 +A configure.ac +A dbus-python.pc.in +M dbus/__init__.py +A dbus/_version.py.in +M dbus/introspect_parser.py +M include/dbus-python.h +A test/TestSuitePythonService.service.in +M test/run-test.sh +A test/run-with-tmp-session-bus.sh +M test/test-client.py +M test/test-service.py +M test/test-signals.py +M test/test-standalone.py +R068 tools/session.conf test/tmp-session-bus.conf.in +D tools/run-with-tmp-session-bus.sh + +commit 73457d0e435f4a9be9a9980fb06dd004b87c6647 +Author: Simon McVittie +Date: 2006-12-18 12:05:00 +0000 + + bus.c, conn-methods.c, conn.c: Alter format of signatures in + docstrings to keep epydoc happy + +M _dbus_bindings/bus.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c + +commit 358403cd0cba20ccda4961a39644c092a0f05b74 +Author: Simon McVittie +Date: 2006-12-18 12:03:27 +0000 + + include/dbus_bindings.h: Rename to include/dbus-python.h, improve + namespacing. + _dbus_bindings/conn-internal.h, + _dbus_bindings/dbus_bindings-internal.h, + _dbus_glib_bindings/module.c: Use dbus-python.h instead of + dbus_bindings.h + +M _dbus_bindings/conn-internal.h +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_glib_bindings/module.c +R096 include/dbus_bindings.h include/dbus-python.h + +commit f4bb2ca522a39fbbf2cce536410c973a73b9059c +Author: Simon McVittie +Date: 2006-12-15 12:56:36 +0000 + + COMPAT.txt: cross off some to-do items, patches now sent upstream + +M COMPAT.txt + +commit 6376c0c422063a48554719f9ec72162c1b63fdda +Author: Simon McVittie +Date: 2006-12-14 16:18:13 +0000 + + _dbus_bindings/module.c: If Python is older than 2.4.2c1, initialize + threads. + In newer versions the PyGILState API is allowed even when threads + haven't been + initialized yet, but in 2.4.1 it causes a crash. It's desirable + to avoid + initializing threads until just before the second thread is created, + since + this creates locking overhead which isn't needed until the app + actually goes + multi-threaded. + +M _dbus_bindings/module.c + +commit 274314c98304fdaa23bcc7b3940ab48e7afe0e8c +Author: Simon McVittie +Date: 2006-12-13 15:02:36 +0000 + + Bump version to 0.80rc2 + +M NEWS +M dbus/__init__.py +M setup.py + +commit 8989e8da843210e7d18c456cfaa12cabc1015ac0 +Author: Simon McVittie +Date: 2006-12-13 15:02:07 +0000 + + MANIFEST.in: include Makefile (for the benefit of mjj29's interop + test) and examples + +M MANIFEST.in + +commit 717c5b4b3852c5e519bc4a1ccb9df8414d4c019c +Author: Simon McVittie +Date: 2006-12-13 14:48:56 +0000 + + list-system-services.py: Use the NULL_MAIN_LOOP + +M examples/list-system-services.py + +commit b70364f2a37e64585c53a72e36481407e375808c +Author: Simon McVittie +Date: 2006-12-13 14:40:32 +0000 + + dbus/examples: Move to examples/ (it's not part of the library and + isn't installed) + +R100 dbus/examples/.cvsignore examples/.cvsignore +R100 dbus/examples/example-client.py examples/example-client.py +R100 dbus/examples/example-service.py +examples/example-service.py +R100 dbus/examples/example-signal-emitter.py +examples/example-signal-emitter.py +R100 dbus/examples/example-signal-recipient.py +examples/example-signal-recipient.py +R100 dbus/examples/gconf-proxy-client.py +examples/gconf-proxy-client.py +R100 dbus/examples/gconf-proxy-service2.py +examples/gconf-proxy-service2.py +R100 dbus/examples/list-system-services.py +examples/list-system-services.py + +commit c874bb37093c39e3dcc974c7bff39a36e4f7202a +Author: Simon McVittie +Date: 2006-12-13 14:39:03 +0000 + + dbus/_dbus.py: Strongly reference shared connections, so they stay + alive and signal handlers etc. stick. On close, remove them from + the table of shared connections first + +M dbus/_dbus.py + +commit 4a7f442a322a8df6306f50ae22aaf049d3807c9f +Author: Simon McVittie +Date: 2006-12-13 14:36:00 +0000 + + dbus/__init__.py: Import exceptions too in case someone is relying + on it + +M dbus/__init__.py + +commit 1cd510ab8be262106e1a57359a06708236b9dd39 +Author: Simon McVittie +Date: 2006-12-13 13:53:38 +0000 + + test/test-client.py: Add test case for weak reference logic (which + would segfault on 0.80rc1) + +M test/test-client.py + +commit a3f966c49e6158a3382a2dce553b91ceb64376fe +Author: Simon McVittie +Date: 2006-12-13 13:50:38 +0000 + + dbus/__init__.py: Import types submodule into dbus, because Sugar + assumes it'll be available + +M dbus/__init__.py + +commit a4b88e345e8ee03ddcf12ce323730d12d51193db +Author: Simon McVittie +Date: 2006-12-13 13:49:38 +0000 + + dbus/_dbus.py: Use absolute import for proxies + +M dbus/_dbus.py + +commit 8edf45a9dc51a70ce4897606f4cd2b08e3536332 +Author: Simon McVittie +Date: 2006-12-13 13:48:40 +0000 + + message-append.c, message-get-args.c: Turn off debug messages even + when debugging other things, they're too verbose + +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c + +commit 422855dd98922b8a3038f7315809462ed6a54ba6 +Author: Simon McVittie +Date: 2006-12-13 13:48:03 +0000 + + _dbus_bindings/conn.c: Fix broken weak reference handling, which + caused a segfault on OLPC. + Also add debug related to this. + +M _dbus_bindings/conn.c + +commit 6ff6bd99176b7b1d7931bb16c8a7c8a75e3755ee +Author: Simon McVittie +Date: 2006-12-13 13:46:29 +0000 + + conn-methods.c: Add tracing + +M _dbus_bindings/conn-methods.c + +commit 98f392d386ae89e3b7ebe397beee6a15869511df +Author: Simon McVittie +Date: 2006-12-13 13:45:55 +0000 + + conn-internal.h: Comment weakref list + +M _dbus_bindings/conn-internal.h + +commit d1bc9f29818e576b07946e0ea9a89e90e1d5ec42 +Author: Simon McVittie +Date: 2006-12-13 13:45:28 +0000 + + bus.c: Add tracing and a couple of missed assertions + +M _dbus_bindings/bus.c + +commit 6afa6d2e76c83c921c799bec3a7b3259248eb57f +Author: Simon McVittie +Date: 2006-12-13 13:45:01 +0000 + + Add TRACE macro and allow debug to be turned off per file + +M _dbus_bindings/dbus_bindings-internal.h + +commit 2ad0498ce6f253da333907ed87df11c6b5a8cf1e +Author: Simon McVittie +Date: 2006-12-12 19:56:17 +0000 + + conn.c: Correct number of varargs to debug message + +M _dbus_bindings/conn.c + +commit 53c4f8628eac5c1ba62e9ccf3be6e1b4c0990b20 +Author: Simon McVittie +Date: 2006-12-12 19:55:38 +0000 + + conn.c: Use __func__ instead of incorrect __FUNC__ + +M _dbus_bindings/conn.c + +commit d8a2d78963cf76051a72bb18e7c9d9dd0afd27e8 +Author: Simon McVittie +Date: 2006-12-12 19:54:05 +0000 + + _dbus_bindings/bus.c, _dbus_bindings/conn-methods.c, + _dbus_bindings/conn.c: Add lifecycle debugging and assertions + +M _dbus_bindings/bus.c +M _dbus_bindings/conn-methods.c +M _dbus_bindings/conn.c + +commit 88306feb544fac52c5ffe7de48ef0fd07a59a749 +Author: Simon McVittie +Date: 2006-12-12 19:46:54 +0000 + + _dbus_bindings/dbus_bindings-internal.h: Add wrapper macro + "DBG_WHEREAMI;" + +M _dbus_bindings/dbus_bindings-internal.h + +commit 883b24563b5f9bf406fcde5edb19caabbc812ac2 +Author: Simon McVittie +Date: 2006-12-12 19:44:41 +0000 + + Add assertion macros and supporting functions + +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/debug.c + +commit b7d21102b99e717e3b4f103d71ce96e8f056cfd4 +Author: Simon McVittie +Date: 2006-12-11 21:57:52 +0000 + + Whitespace consistency: Don't put a space between function name and + parentheses around arguments + +M _dbus_bindings/bus.c +M _dbus_bindings/message-append.c +M _dbus_bindings/message-get-args.c +M _dbus_bindings/message.c + +commit 830f94f31010d4783490217d4b02f6f87927ae4c +Author: Simon McVittie +Date: 2006-12-11 21:45:29 +0000 + + Convert generic glue, main loop integration, message append/get_args, + validation into separate translation units - no *-impl.h remaining + +M _dbus_bindings/dbus_bindings-internal.h +R088 _dbus_bindings/generic-impl.h _dbus_bindings/generic.c +R087 _dbus_bindings/mainloop-impl.h _dbus_bindings/mainloop.c +R098 _dbus_bindings/message-append-impl.h +_dbus_bindings/message-append.c +R098 _dbus_bindings/message-get-args-impl.h +_dbus_bindings/message-get-args.c +A _dbus_bindings/message-internal.h +M _dbus_bindings/message.c +M _dbus_bindings/module.c +R074 _dbus_bindings/validation-impl.h +_dbus_bindings/validation.c +M setup.py + +commit 8ab339978d34b8c14dcf53aa6fbf228efb9130c6 +Author: Simon McVittie +Date: 2006-12-11 20:30:19 +0000 + + Separate out remaining types (abstract, bytes, containers, int, + float, signature, string) into separate translation units + +M Makefile +R097 _dbus_bindings/abstract-impl.h _dbus_bindings/abstract.c +R097 _dbus_bindings/bytes-impl.h _dbus_bindings/bytes.c +R098 _dbus_bindings/containers-impl.h +_dbus_bindings/containers.c +M _dbus_bindings/dbus_bindings-internal.h +R096 _dbus_bindings/floattypes-impl.h _dbus_bindings/float.c +M _dbus_bindings/generic-impl.h +R070 _dbus_bindings/types-impl.h _dbus_bindings/int.c +M _dbus_bindings/module.c +R097 _dbus_bindings/signature-impl.h _dbus_bindings/signature.c +A _dbus_bindings/string.c +M _dbus_bindings/types-internal.h +M setup.py + +commit 14df12b437c1d8e0ce79aa90c99d58c820a94048 +Author: Simon McVittie +Date: 2006-12-11 20:06:09 +0000 + + Split out exceptions, pending call, message into separate .c files + +M _dbus_bindings/abstract-impl.h +M _dbus_bindings/bus.c +M _dbus_bindings/bytes-impl.h +M _dbus_bindings/conn.c +M _dbus_bindings/containers-impl.h +M _dbus_bindings/dbus_bindings-internal.h +R083 _dbus_bindings/exceptions-impl.h +_dbus_bindings/exceptions.c +M _dbus_bindings/floattypes-impl.h +M _dbus_bindings/generic-impl.h +M _dbus_bindings/mainloop-impl.h +M _dbus_bindings/message-append-impl.h +M _dbus_bindings/message-get-args-impl.h +R097 _dbus_bindings/message-impl.h _dbus_bindings/message.c +M _dbus_bindings/module.c +R097 _dbus_bindings/pending-call-impl.h +_dbus_bindings/pending-call.c +M _dbus_bindings/signature-impl.h +M _dbus_bindings/types-impl.h +A _dbus_bindings/types-internal.h +M setup.py + +commit 7ee3e9020ae67172b82b39fee05d25db3f43ea08 +Author: Simon McVittie +Date: 2006-12-08 17:57:12 +0000 + + _dbus_bindings: debug-impl.h -> debug.c + +R100 _dbus_bindings/debug-impl.h _dbus_bindings/debug.c +M _dbus_bindings/module.c +M setup.py + +commit 3273a66c7b0d8a91ffe68732a482d17775627273 +Author: Simon McVittie +Date: 2006-12-08 17:55:24 +0000 + + _dbus_bindings: bus-impl.h -> bus.c + +R099 _dbus_bindings/bus-impl.h _dbus_bindings/bus.c +M _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/module.c + +commit f50c6643bf9fe153a7add75ca150a1470b7eb63a +Author: Simon McVittie +Date: 2006-12-08 17:50:25 +0000 + + _dbus_bindings: split out conn, conn-methods into separate translation + units + +M _dbus_bindings/bus-impl.h +A _dbus_bindings/conn-internal.h +R080 _dbus_bindings/conn-methods-impl.h +_dbus_bindings/conn-methods.c +R060 _dbus_bindings/conn-impl.h _dbus_bindings/conn.c +A _dbus_bindings/dbus_bindings-internal.h +M _dbus_bindings/debug-impl.h +M _dbus_bindings/exceptions-impl.h +M _dbus_bindings/generic-impl.h +M _dbus_bindings/mainloop-impl.h +M _dbus_bindings/message-impl.h +M _dbus_bindings/module.c +M _dbus_bindings/pending-call-impl.h +M _dbus_bindings/types-impl.h +M _dbus_bindings/validation-impl.h +M include/dbus_bindings.h +M setup.py + +commit 380b44d38d333092bc9fe2eae8b7a836cb2791c7 +Author: Simon McVittie +Date: 2006-12-08 16:10:12 +0000 + + _dbus_bindings/conn-impl.h: Be more careful that referenced + Connections always have a DBusConnection + +M _dbus_bindings/conn-impl.h + +commit 93b846e642ea1830b40aee6dfc600b8cd18b51bf +Author: Simon McVittie +Date: 2006-12-08 16:08:56 +0000 + + _dbus_bindings/bus-impl.h: Correctly construct Bus objects with + non-default addresses + +M _dbus_bindings/bus-impl.h + +commit 9c4374aba50a9de68e307b85dc0f4d0425ee0b1b +Author: Simon McVittie +Date: 2006-12-07 18:43:07 +0000 + + gconf-proxy-{client,service2}.py: Print a message warning that these + might not work. + gconf-proxy-service.py: Delete, it uses API which was obsoleted + long ago. + +M dbus/examples/gconf-proxy-client.py +D dbus/examples/gconf-proxy-service.py +M dbus/examples/gconf-proxy-service2.py + +commit 11757fcd9434e1e541c928ee34a6294a120bc0eb +Author: Simon McVittie +Date: 2006-12-07 18:40:31 +0000 + + dbus/examples/example-*.py: update to current API + +M dbus/examples/example-client.py +M dbus/examples/example-service.py +M dbus/examples/example-signal-emitter.py +M dbus/examples/example-signal-recipient.py + +commit ed1306b347fedce65a24bf525ad9d430bcfdf15d +Author: Simon McVittie +Date: 2006-12-07 18:39:51 +0000 + + dbus/_dbus.py, dbus/proxies.py: Add keyword arguments + interface_keyword, member_keyword, destination_keyword (completing + the set of useful message fields for signal handlers); also add + message_keyword (for advanced use) + +M dbus/_dbus.py +M dbus/proxies.py + +commit 14bf5b0eb6dcd7da8b4f3e90d55480dfa0c4b9b7 +Author: Simon McVittie +Date: 2006-12-07 18:37:58 +0000 + + dbus/decorators: Remove explicitly_pass_message + +M dbus/decorators.py + +commit 090091828e1d616171601d68aed00991d93dfd49 +Author: Simon McVittie +Date: 2006-12-07 16:53:42 +0000 + + examples/list-system-services.py: Print services in a nicer form, + once per line. Offer to connect to the session bus instead. + +M dbus/examples/list-system-services.py + +commit 9802e3eb22d1ed464eec71153067593db7071764 +Author: Simon McVittie +Date: 2006-12-06 12:56:59 +0000 + + NEWS, setup.py, dbus/__init__.py: Bump version to 0.80rc1, aka 0.79.91 + +M NEWS +M dbus/__init__.py +M setup.py + +commit c5c7185c7638b650608a0854f28afbd94208ab02 +Author: Simon McVittie +Date: 2006-12-05 18:46:45 +0000 + + MANIFEST.in: add TODO (but not COMPAT.txt, which shouldn't go in + the sdist) + +M MANIFEST.in + +commit 49ea22f2a1be697437f7c232613c87920957bc86 +Author: Simon McVittie +Date: 2006-12-05 18:38:36 +0000 + + TODO, COMPAT.txt: add + +A COMPAT.txt +A TODO + +commit aa0710da718fb04079076b6b02c486a177323322 +Author: Simon McVittie +Date: 2006-12-05 18:37:54 +0000 + + dbus/__init__.py, dbus/_dbus.py, dbus/service.py: Improve docstrings, + imports, __all__ + +M dbus/__init__.py +M dbus/_dbus.py +M dbus/service.py + +commit 31ecbdd6c42cd508ae6510e9655a805094f04b31 +Author: Simon McVittie +Date: 2006-12-05 18:36:53 +0000 + + _dbus_bindings/validation-impl.h: Mark new functions as :Since: 0.80 + +M _dbus_bindings/validation-impl.h + +commit e4a70180d3ab0eb77264dc1a9f22b2521e5d3607 +Author: Simon McVittie +Date: 2006-12-05 18:36:21 +0000 + + _dbus_bindings/types-impl.h: Always implement Int64 and UInt64 at + least as a stub, raising NotImplementedError from the constructor + on 64-bit-deficient platforms. Improve docstrings. + +M _dbus_bindings/types-impl.h + +commit 34b237b3e1ed0c6665892f3a4765b09e29bdb3a5 +Author: Simon McVittie +Date: 2006-12-05 18:34:58 +0000 + + _dbus_bindings/signature-impl.h: Improve Signature class docstring + +M _dbus_bindings/signature-impl.h + +commit 69d95e61f95c21708596d2f973f46cde61521e68 +Author: Simon McVittie +Date: 2006-12-05 18:34:21 +0000 + + _dbus_bindings/message-append-impl.h, + _dbus_bindings/message-get-args.h: Use PY_LONG_LONG rather + than long long to support deficient platforms; consistently use + NotImplementedError for platforms with no PY_LONG_LONG type + +M _dbus_bindings/message-append-impl.h +M _dbus_bindings/message-get-args-impl.h + +commit 4ed5dcb72bcc41aa9327461a0cad325fa8d1afbd +Author: Simon McVittie +Date: 2006-12-05 18:32:25 +0000 + + _dbus_bindings/containers-impl.h: Disallow empty structs. Improve + docstrings + +M _dbus_bindings/containers-impl.h + +commit 42ea333ddd2351b4dc87c12089efbda89165783b +Author: Simon McVittie +Date: 2006-12-05 18:31:54 +0000 + + _dbus_bindings/module.c: Add Constructor, Supported usage field + declarations for epydoc + +M _dbus_bindings/module.c + +commit 4779424a806aecfce2754eb8fc4673f0ce35823e +Author: Simon McVittie +Date: 2006-12-05 11:36:50 +0000 + + dbus/decorators.py: Say that explicitly_pass_message() is deprecated + +M dbus/decorators.py + +commit c08743227d9e78da2d02d1e1f5a621d43d38efc4 +Author: Simon McVittie +Date: 2006-12-05 11:36:17 +0000 + + dbus/glib.py: mention that the new API only works in >= 0.80 + +M dbus/glib.py + +commit cb7538d514e968c19c3fea74bd5de89330112ed5 +Author: Simon McVittie +Date: 2006-12-05 11:35:51 +0000 + + dbus/introspect_parser.py: Add docstring for + process_introspection_data() + +M dbus/introspect_parser.py + +commit 3c606fda6ea70622ee234cc51d63644ab27e6e55 +Author: Simon McVittie +Date: 2006-12-05 11:35:23 +0000 + + dbus/mainloop/__init__.py, dbus/mainloop/glib.py: Add docstrings + +M dbus/mainloop/__init__.py +M dbus/mainloop/glib.py + +commit 0c7cc37a5ac8fe1a044cfcf6d615aa8341dcb30e +Author: Simon McVittie +Date: 2006-12-05 11:34:54 +0000 + + dbus/proxies.py: trivial change to process_introspection_data() + invocation: import and "." => from-import + +M dbus/proxies.py + +commit 01a91b63644b7f1e8b23dea20f639a9b13bb36ef +Author: Simon McVittie +Date: 2006-12-05 11:33:51 +0000 + + setup.py, dbus/matchrules.py: Remove obsolete dbus.matchrules (the + new implementation is in _dbus) + +D dbus/matchrules.py +M setup.py + +commit 3655f865eb742eacc9f677c34757b0f115a7179b +Author: Simon McVittie +Date: 2006-12-05 11:33:10 +0000 + + Stop asserting that dbus.Struct(()) works + +M test/test-standalone.py + +commit 880a2a87e78355e546dc97f0661f500c1c42da73 +Author: Simon McVittie +Date: 2006-12-04 14:13:24 +0000 + + dbus/__init__.py: remove FIXME comment + +M dbus/__init__.py + +commit 8339653949802cb296811fe488b53b721d63e0f7 +Author: Simon McVittie +Date: 2006-12-04 14:11:40 +0000 + + dbus/proxies.py: Ignore unused result from send_message. Pass on + SignalMatch result from add_signal_receiver() so caller can disconnect + the signal more easily. + +M dbus/proxies.py + +commit 539faca6578f418da4bbbbd9d4a77c2f5fad682c +Author: Simon McVittie +Date: 2006-12-04 13:43:42 +0000 + + dbus/introspect_parser.py: Import the right exceptions module, + so we can raise the right exception + +M dbus/introspect_parser.py + +commit f6284a1b6552652c84e76585fd208ea361ff288b +Author: Simon McVittie +Date: 2006-12-04 13:42:43 +0000 + + test/test-signals.py: add test case for signal handling; + test/run-test.sh: run test-signals. + +M test/run-test.sh +A test/test-signals.py + +commit 14ae543d77a0d6ec72d10ba33c5a50c801f1feab +Author: Simon McVittie +Date: 2006-12-04 13:41:48 +0000 + + dbus/_dbus.py: Re-work signal matching so it does the right thing + when name ownership changes + +M dbus/_dbus.py + +commit 601a1a2b4bbabebb248310334a60413bffde9780 +Author: Simon McVittie +Date: 2006-12-04 13:35:24 +0000 + + _dbus_bindings/bus-impl.h: Correct docstring for + Bus.remove_match_string + +M _dbus_bindings/bus-impl.h + +commit a61bb622aa26d48de7cb1cb269d4b4cfc75dda3f +Author: Simon McVittie +Date: 2006-11-30 17:23:38 +0000 + + dbus._dbus, dbus.decorators, dbus.service: Update names of newly + public low-level methods + +M dbus/_dbus.py +M dbus/decorators.py +M dbus/service.py + +commit 469c2586d661e16193c9d22772b37d2fe98ad5da +Author: Simon McVittie +Date: 2006-11-30 17:22:49 +0000 + + _dbus_bindings/pending-call-impl.h: Fix reference counting + +M _dbus_bindings/pending-call-impl.h + +commit 2c5f7716211f0157bf6a4fe93ea3df7f03c5f5e8 +Author: Simon McVittie +Date: 2006-11-30 17:15:00 +0000 + + _dbus_bindings/mainloop-impl.h: Fix compilation with debug enabled + +M _dbus_bindings/mainloop-impl.h + +commit 114f98df9c1a6897b0030430550a23b3d5da0a83 +Author: Simon McVittie +Date: 2006-11-30 17:02:02 +0000 + + dbus.proxies: Alter calls to methods which have become public + +M dbus/proxies.py + +commit 535e860b648798aae2644b2b222f19990484be88 +Author: Simon McVittie +Date: 2006-11-30 17:00:07 +0000 + + setup.py: Add dbus.lowlevel + +M setup.py + +commit 4237e29b6f76e7dcfc1b34b984f9640e9a57fb7d +Author: Simon McVittie +Date: 2006-11-30 16:59:48 +0000 + + dbus/__init__.py: Document existence of dbus.lowlevel + +M dbus/__init__.py + +commit 0586633996ed3d529588b1c429f2dd02ecb9bf5a +Author: Simon McVittie +Date: 2006-11-30 16:59:22 +0000 + + _dbus_bindings/pending-call-impl.h: Make block() public and work + around dbus_pending_call_set_notify() race + +M _dbus_bindings/pending-call-impl.h + +commit 181ff34cbd75fdb0cdfe71628f22d7b5f4b34d7b +Author: Simon McVittie +Date: 2006-11-30 16:58:18 +0000 + + dbus.lowlevel: Add module exposing lower-level classes for advanced + users + _dbus_bindings/message-impl.h: Indicate that Message classes' + "official" + location is dbus.lowlevel + +M _dbus_bindings/message-impl.h +A dbus/lowlevel.py + +commit 79abbf3a2c3ddd67e8b655f597f74cca347c4a26 +Author: Simon McVittie +Date: 2006-11-30 16:56:49 +0000 + + Make send, etc. public, but rename to send_message etc. + +M _dbus_bindings/conn-methods-impl.h + +commit 7db487a5e4efcdaf6c8ff59dfa6f26c5042ee1e9 +Author: Simon McVittie +Date: 2006-11-30 13:48:26 +0000 + + Document the absence of dbus.mainloop.MainLoop in this release. + Add get_object_by_unique_name to Bus objects. + +M _dbus_bindings/mainloop-impl.h +M dbus/_dbus.py +M dbus/proxies.py + +commit 69660ac1b650a2328f21dc2d9953700d1efe1e17 +Author: Simon McVittie +Date: 2006-11-30 11:08:41 +0000 + + API_CHANGES.txt: Document mainloop changes + +M API_CHANGES.txt + +commit 77778920c41ddc3fe99771f4bd0f865e9550868c +Author: Simon McVittie +Date: 2006-11-30 11:08:08 +0000 + + dbus/mainloop/__init__.py: Export glib submodule; improve docstrings + +M dbus/mainloop/__init__.py + +commit c5e4c6f8d67ad4305ab7e2254de10a6320b9c305 +Author: Simon McVittie +Date: 2006-11-30 11:07:16 +0000 + + Emulate old bus_request_name, bus_release_name + +M dbus/dbus_bindings.py + +commit e54d3f2c370ebcdb07269b49081519017981bcdb +Author: Simon McVittie +Date: 2006-11-30 11:06:53 +0000 + + dbus/service.py: Allow a Connection as parameter to Object + constructor, to avoid having to have a well-known bus name + +M dbus/service.py + +commit 6120021f3563f2df73fc35b2ded4ae30958a47da +Author: Simon McVittie +Date: 2006-11-30 11:05:55 +0000 + + dbus/__init__.py: Export get_default_main_loop, set_default_main_loop + and submodules service and mainloop + +M dbus/__init__.py + +commit 9c1b58183966ae8a622796ae3df4a5a699bfd5fc +Author: Simon McVittie +Date: 2006-11-30 11:05:17 +0000 + + dbus/glib.py: Use new API to set main loop as default + +M dbus/glib.py + +commit f3a23de9e022e708b9884d36f65ab9ccaf634bee +Author: Simon McVittie +Date: 2006-11-30 11:04:48 +0000 + + dbus/_dbus.py: Import get_default_main_loop, set_default_main_loop + +M dbus/_dbus.py + +commit 605a8ec83eba854b319d94c9fee3467e52999005 +Author: Simon McVittie +Date: 2006-11-30 11:04:06 +0000 + + _dbus_glib_bindings/module.c: Support set_as_default keyword argument + +M _dbus_glib_bindings/module.c + +commit 3aff827e8fe14a9fb9b1846e00c32f01afee40b2 +Author: Simon McVittie +Date: 2006-11-30 11:03:19 +0000 + + _dbus_bindings: Change default-main-loop API to use global functions + get_default_main_loop, set_default_main_loop. Improve docstrings + +M _dbus_bindings/bus-impl.h +M _dbus_bindings/conn-impl.h +M _dbus_bindings/conn-methods-impl.h +M _dbus_bindings/mainloop-impl.h +M _dbus_bindings/module.c + +commit 919cd3aeac6676b19246091a6ff762bb6e154773 +Author: Simon McVittie +Date: 2006-11-24 13:00:13 +0000 + + include/dbus_bindings.h: Put _dbus_bindings in a static variable + when imported + into e.g. _dbus_glib_bindings. Re-indent for consistency. + +M include/dbus_bindings.h + +commit 16d460e5c4987d67a4db248c5fd1a69ca8b0ab23 +Author: Simon McVittie +Date: 2006-11-24 12:58:39 +0000 + + setup.py: Don't remove ChangeLog on clean. + Yes, it's generated, but that just means it shouldn't be in the git + repo; it + should still appear in tarballs. + +M setup.py + +commit 894bafef2cae44d4b41845ed900cffe65dd63900 +Author: Simon McVittie +Date: 2006-11-23 16:44:21 +0000 + + _dbus_bindings/mainloop-impl.h: Add Watch and Timeout types + _dbus_bindings/generic-impl.h: Add Glue_tp_hash_by_pointer and + Glue_tp_richcompare_by_pointer to support the above + +M _dbus_bindings/generic-impl.h +M _dbus_bindings/mainloop-impl.h + +commit aabf7935466aee3c8cc82f9c08a39017fcb603f8 +Author: Simon McVittie +Date: 2006-11-23 16:43:05 +0000 + + _dbus_bindings/conn-methods-impl.h: Correct docstring: there is + no dbus.mainloop.base + +M _dbus_bindings/conn-methods-impl.h + +commit 4a51f14170ffa4750b459fa4250bd7ce89bfa801 +Author: Simon McVittie +Date: 2006-11-22 18:27:27 +0000 + + Bump version to 0.80pre2 (or internally 0.79.2) + +M dbus/__init__.py +M setup.py + +commit 49c03f8525e321467eca862b186fa58ff2621f18 +Author: Simon McVittie +Date: 2006-11-22 18:25:47 +0000 + + MANIFEST.in: include MANIFEST.in itself + +M MANIFEST.in + +commit f064ecd77fb99506ea32c500e687a59ee68d9425 +Author: Simon McVittie +Date: 2006-11-22 18:24:48 +0000 + + Include top-level dbus_bindings.py (missed in previous commit) + +A dbus_bindings.py + +commit 5bcdc1378cceb0885fc2138e55259f15a83fa1ce +Author: Simon McVittie +Date: 2006-11-22 18:18:13 +0000 + + Add short-term backwards compatibility with dbus_bindings (various + programs try to catch dbus_bindings.DBusException) + +M dbus/__init__.py +M dbus/_dbus.py +R053 _dbus_bindings/dbus_bindings.py dbus/dbus_bindings.py +M setup.py + +commit 08971243466ab63ea19a20a1c1f1fd0d98714541 +Author: Simon McVittie +Date: 2006-11-22 17:34:56 +0000 + + Remove _dbus_bindings/test.py (duplicates bits of test-standalone) + +D _dbus_bindings/test.py + +commit 4a0902b38a50d34f28ce022fe0684aec8ce91718 +Author: Simon McVittie +Date: 2006-11-22 17:33:59 +0000 + + MANIFEST.in: pass through LC_ALL=C sort -k2 + +M MANIFEST.in + +commit f2c08d18ac2645311e4c0d94da0b06b3754a6def +Author: Simon McVittie +Date: 2006-11-22 17:28:56 +0000 + + Add improved main-loop integration. + Currently only GLib (with the default main context) and a "null + main loop" + are supported, but a pure-Python main loop could be supported without + incompatible API changes. + +M _dbus_bindings/bus-impl.h +M _dbus_bindings/conn-impl.h +M _dbus_bindings/conn-methods-impl.h +A _dbus_bindings/mainloop-impl.h +M _dbus_bindings/module.c +M _dbus_glib_bindings/module.c +M dbus/__init__.py +M dbus/_dbus.py +M dbus/glib.py +A dbus/mainloop/__init__.py +C081 dbus/glib.py dbus/mainloop/glib.py +M dbus/proxies.py +M include/dbus_bindings.h +M setup.py + +commit aad4ee9dfbe203e74bffb0ec93bdd180143e4cee +Author: Simon McVittie +Date: 2006-11-21 18:13:14 +0000 + + _dbus_bindings/conn-impl.h: Check for errors, printing them if + necessary, before releasing GIL + +M _dbus_bindings/conn-impl.h + +commit df744af92832a69dbdbe97014bee38f6271ca30a +Author: Simon McVittie +Date: 2006-11-16 14:34:21 +0000 + + Bump version to 0.80~pre1 (but in __init__.py, write it as 0.79.1) + +M dbus/__init__.py +M setup.py + +commit 9e682a1a6d60bc31b63552c240718a9b7583f1c7 +Author: Simon McVittie +Date: 2006-11-16 14:25:27 +0000 + + MANIFEST.in: remove README, which doesn't exist + +M MANIFEST.in + +commit 280061c0e03fb59f1eabf950fa4ab0716b4b7a39 +Author: Simon McVittie +Date: 2006-11-15 19:26:56 +0000 + + dbus._dbus, dbus.proxies: Raise RuntimeError when user tries to do + async calls or receive signals without a main loop + This makes the Connection base class useless, but should let + people know + that they need to use dbus.glib for async functionality. I do + intend to + replace the mainloop integration so GLib isn't the only option. + +M dbus/_dbus.py +M dbus/proxies.py + +commit 48a87921075edbe3b94cdd1ddfef90b8f6e3a152 +Author: Simon McVittie +Date: 2006-11-15 19:02:20 +0000 + + HACKING.txt: fix typo + +M HACKING.txt + +commit 192d203341d584a3f6502d0c3fb45d26870e7698 +Author: Simon McVittie +Date: 2006-11-15 16:31:23 +0000 + + dbus._dbus, cross-test-server: fix signal calling convention support, + and test it in cross-test-server + +M dbus/_dbus.py +M test/cross-test-server.py + +commit 1974c56c89080df4d38eba8b5d251680b5c42131 +Author: Simon McVittie +Date: 2006-11-15 16:04:38 +0000 + + dbus._dbus, dbus.matchrules, dbus.proxies: Support utf8_strings and + byte_arrays calling convention options to signal handlers. Handle + arg matches containing "'" correctly + +M dbus/_dbus.py +M dbus/matchrules.py +M dbus/proxies.py + +commit 069d09797e22cf6d70c82c9b39edb3a094dd1e83 +Author: Simon McVittie +Date: 2006-11-15 15:51:28 +0000 + + dbus._dbus: Whitespace + +M dbus/_dbus.py + +commit b02991564418e2136ac305669afa8457595fd397 +Author: Simon McVittie +Date: 2006-11-15 15:44:09 +0000 + + _dbus_bindings/bus-impl.h: Remove duplicate registration of + name_has_owner method + +M _dbus_bindings/bus-impl.h + +commit d3aa18da0ee31f4c7c6e17b9d027237021402292 +Author: Simon McVittie +Date: 2006-11-15 15:16:59 +0000 + + Makefile: Produce warning about "development use only" for all + targets. Set targets PHONY. Make docs depend on build, now the build + is quicker + +M Makefile + +commit 6008b37253f7a04b563b28a2aa9357de8cfd29d1 +Author: Simon McVittie +Date: 2006-11-14 15:48:47 +0000 + + - dbus.service.Object, dbus.decorators.method: Allow utf8_strings and + byte_arrays parameters kwargs when exporting a + method. These change the calling convention in the same way as + Message.get_args_list(). + - dbus.proxies.ProxyMethod: allow the same kwargs to be passed to + any proxy + method; this time, they change the representation of the remote + method's + return value(s). + - Test that the above work + - Improve correctness of setting the NAME_FLAG_* flags + - Whitespace tweaks (remove hard tabs) + +M dbus/decorators.py +M dbus/proxies.py +M dbus/service.py +M test/cross-test-server.py +M test/test-client.py +M test/test-service.py + +commit 21b10a103d91651d9ac55d2d22832a5df251f45e +Author: Simon McVittie +Date: 2006-11-14 14:31:43 +0000 + + Test UTF8String as well as String + +M test/cross-test-client.py + +commit 7416bf25886650aec413eea2ca2c42b69f5a3537 +Author: Simon McVittie +Date: 2006-11-14 14:30:19 +0000 + + Update tests for the new variant API + +M test/cross-test-client.py +M test/cross-test-server.py +M test/run-test.sh +M test/test-client.py +M test/test-service.py +M test/test-standalone.py + +commit 1761e5bd810ea45776e2d1c82193b73184ed3eda +Author: Simon McVittie +Date: 2006-11-14 14:29:13 +0000 + + Update API_CHANGES.txt + +M API_CHANGES.txt + +commit 9997fd83b55e16d1c50fe04ce57951483f867982 +Author: Simon McVittie +Date: 2006-11-14 14:28:36 +0000 + + Makefile: + - Clarify that this is only for d-p developers, not for packagers or + end users. + - Build with lots of warnings, and -Werror, but disable warning + about partially + uninitialized structs since this is conventional in Python + (for source + backwards compatibility). + +M Makefile + +commit 1a4b9502f1d06e94fd5f90bfd85cf4d47b88c1fd +Author: Simon McVittie +Date: 2006-11-14 14:26:14 +0000 + + setup.py: Import CFLAGS from environment (used by development Makefile + for warning control) + +M setup.py + +commit 4ce650d5c4ca5807c8eb4bc6f8074ff6eddab359 +Author: Simon McVittie +Date: 2006-11-14 14:25:39 +0000 + + Remove Variant from API, add UTF8String + +M dbus/__init__.py + +commit bf5550fdcbd02a55d18f17d2b79e692145dfad58 +Author: Simon McVittie +Date: 2006-11-14 14:25:04 +0000 + + Import the newly re-added types into dbus.types + +M dbus/types.py + +commit 0bd42c7cce423ce04def63217675b730228294af +Author: Simon McVittie +Date: 2006-11-14 14:24:37 +0000 + + - Convert Message.get_args_list and Message.append to the new way + of handling variants + - Remove most of the options for get_args_list and just do the + right thing + +M _dbus_bindings/message-append-impl.h +M _dbus_bindings/message-get-args-impl.h + +commit b2ba98067873acdc8f7989b63384fc1d37da49d1 +Author: Simon McVittie +Date: 2006-11-14 14:20:10 +0000 + + - Add variant_level to Array, Dict, Struct + - Remove Variant type + +M _dbus_bindings/containers-impl.h + +commit 481428655794be4491cf7fd33f86b8e9e059a2d6 +Author: Simon McVittie +Date: 2006-11-14 14:18:30 +0000 + + - Remove special case for ObjectPaths when registering object paths - + now that + they have a __dict__, they can reference the Connection, which + is bad + - Accept Unicode object paths for deregistration + - Correctly raise an exception on non-str, non-unicode arguments + where an + object-path is expected + - Annotate unused arguments + +M _dbus_bindings/conn-methods-impl.h + +commit 5c908374f838e7b88c6725c6b54308316d8ed798 +Author: Simon McVittie +Date: 2006-11-14 14:15:51 +0000 + + - Remove float types from types-impl.h. + - Re-order. + - Subclass DBusPythonInt, etc. + - Add UTF8String and (unicode) String types + +M _dbus_bindings/types-impl.h + +commit 5bed478bed959ad477efac7da01ced0d0a76d6ed +Author: Simon McVittie +Date: 2006-11-14 14:12:47 +0000 + + Make Signature a subclass of DBusPythonString + +M _dbus_bindings/signature-impl.h + +commit 23013477f373aae9569e05bf793dcb3ec92530fb +Author: Simon McVittie +Date: 2006-11-14 14:12:11 +0000 + + - Add Double type (and Float type #if'd out, ready for Alp's 32-bit + float type + if/when it's added to libdbus) + - Include "abstract" base classes and float types in module.c + +A _dbus_bindings/floattypes-impl.h +M _dbus_bindings/module.c + +commit 3c5d7904ea641f2b4adcf1edb1165e1381119120 +Author: Simon McVittie +Date: 2006-11-14 14:10:16 +0000 + + - Make Byte a subclass of DBusPythonInt + - Make ByteArray a subclass of DBusPythonString + - Remove Byte_as_uchar, Byte_from_uchar, ByteArray_as_ucharptr, + ByteArray_from_uchars helpers + - Don't try to do clever things for Byte memory allocation + +M _dbus_bindings/bytes-impl.h + +commit 77c594008a1a4a655a94868c0028ef6fdec0b492 +Author: Simon McVittie +Date: 2006-11-14 14:01:25 +0000 + + Add abstract-impl.h: abstract base classes for D-Bus types that + subclass int/float/long/str, with a variant_level attribute. + +A _dbus_bindings/abstract-impl.h + +commit ec4382fc301ddd60c4abfa0175e912880980de68 +Author: Simon McVittie +Date: 2006-11-14 14:00:33 +0000 + + Annotate UNUSED arguments + +M _dbus_bindings/bus-impl.h +M _dbus_bindings/message-impl.h +M _dbus_bindings/pending-call-impl.h +M _dbus_bindings/validation-impl.h +M _dbus_glib_bindings/module.c + +commit 7e742ca5b5543ea290175f9351053f9ad6cfd492 +Author: Simon McVittie +Date: 2006-11-14 13:58:02 +0000 + + Add Glue_immutable_setattro, DEFINE_CHECK, UNUSED attribute. Remove + generic repr() functions + +M _dbus_bindings/generic-impl.h + +commit 3ab7a818a7a7a92a15de50ef848318ca61a6d2df +Author: Simon McVittie +Date: 2006-11-02 13:24:03 +0000 + + Revert switch from Byte being an int subclass to a str subclass + following discussion with J5. + Switching Byte to be a single-character string is arguably more + Pythonic, but + needlessly breaks API. + +M _dbus_bindings/bytes-impl.h +M _dbus_bindings/generic-impl.h +M _dbus_bindings/message-append-impl.h +M _dbus_bindings/message-get-args-impl.h +M _dbus_bindings/types-impl.h +M test/cross-test-client.py +M test/cross-test-server.py +M test/test-standalone.py + +commit 263e3ad1cf99e7cd115e7051ed1ea3f2cc35c587 +Author: Simon McVittie +Date: 2006-10-05 17:37:07 +0100 + + Seth was a Red Hat employee when contributing to dbus-python: alter + copyright notices accordingly + +M dbus/__init__.py +M dbus/_dbus.py +M dbus/decorators.py +M dbus/introspect_parser.py +M dbus/matchrules.py +M dbus/proxies.py +M dbus/service.py +M setup.py +M test/test-client.py +M test/test-service.py + +commit da74c4cce7fee0dc4b5f0fa2144211f1bd0d9cdd +Author: Simon McVittie +Date: 2006-10-05 17:36:25 +0100 + + test/test-standalone.py: Test API guarantee that integer types + subclass int or long + +M test/test-standalone.py + +commit 6a9cafc90a31cf1d396b8a492fc1d618ef03dc65 +Author: Simon McVittie +Date: 2006-10-02 15:28:00 +0100 + + test/cross-test-client.py: Add more workarounds for odd dbus-java + behaviour. Compare InvertMapping results better. + +M test/cross-test-client.py + +commit df50fee665eb68d27394123ca79475bd37a0c528 +Author: Simon McVittie +Date: 2006-10-02 15:26:42 +0100 + + Produce debug output + +M test/cross-test-server.py + +commit 3ad6bd460e0addc46cb503984e6d9cf2868111f5 +Author: Simon McVittie +Date: 2006-10-02 15:26:17 +0100 + + Use a temp variable to make crash debugging easier (although I now + can't reproduce the crash...) + +M _dbus_bindings/pending-call-impl.h + +commit 8801e3159d5a5a048eb30bd030ecb5dbd16610f9 +Author: Simon McVittie +Date: 2006-09-29 20:47:09 +0100 + + Make cross-test stricter by including extreme values for integers, + etc. + +M test/cross-test-client.py + +commit 52336a79a623dc2674ce22965eb6f0b010078b5e +Author: Simon McVittie +Date: 2006-09-29 20:46:13 +0100 + + When trying to validate an int64 it helps if you put it in a 64-bit + variable. + +M _dbus_bindings/types-impl.h + +commit 0590a83202f27a98b8bb898876339a9b02a60896 +Author: Simon McVittie +Date: 2006-09-28 18:17:41 +0100 + + test/cross-test-client.py, test/cross-test-server.py: Start to fix + for interop with dbus-java: + * Don't assume we have introspection data - only call methods with + correctly + typed parameters + * Make InvertMapping check order-independent + * Make signal test not fail if the Triggered signal is meant to come + from /Test + * Use logging rather than sys.stderr + +M test/cross-test-client.py +M test/cross-test-server.py + +commit dd48a45dec3704ee459a418734485985e5fba205 +Author: Simon McVittie +Date: 2006-09-28 16:03:11 +0100 + + test/cross-test-client.py, test/cross-test-server.py: Output in the + same format dbus-java does (the <> in the specification were not + meant to be literal, apparently) + +M test/cross-test-client.py +M test/cross-test-server.py + +commit 3d645c9743e630d5064566a3a35d1e2c35d76cc2 +Author: Simon McVittie +Date: 2006-09-28 16:00:22 +0100 + + dbus/_dbus.py, dbus/proxies.py: Amend docstrings for signal receiving + +M dbus/_dbus.py +M dbus/proxies.py + +commit f9d2961b45a085dc5d8febf8b1ed0f9caa9558ec +Author: Simon McVittie +Date: 2006-09-28 15:59:17 +0100 + + setup.py: Remove "import extract" (no longer exists) + +M setup.py + +commit fcd45af4aa4fd81454f1c8a8fa7b8b5790f44b54 +Author: Simon McVittie +Date: 2006-09-27 14:26:44 +0100 + + Add copyright, AFL2.1, GPL2 notices, which might even be correct... + + The lists of copyright holders are derived from the D-Bus CVS + changelog: I've + erred on the side of adding people to the list rather than not. + + For now I've assumed that J5's contributions are owned by Red Hat, + Collabora + people's contributions (Rob McQueen, Rob Taylor, Ole Andre Ravnaas, + myself) are owned by Collabora and everything else is owned by + the author. + +M dbus/__init__.py +M dbus/_dbus.py +M dbus/decorators.py +M dbus/glib.py +M dbus/introspect_parser.py +M dbus/matchrules.py +M dbus/proxies.py +M dbus/service.py +M setup.py +M test/cross-test-client.py +M test/cross-test-server.py +M test/crosstest.py +M test/test-client.py +M test/test-service.py +M test/test-standalone.py + +commit 329dc1e985c5090bba889e8ac5543d47c6abb5e2 +Author: Simon McVittie +Date: 2006-09-27 14:16:29 +0100 + + Put AUTHORS in the right order + +M AUTHORS + +commit 7aed1104ddafd10c708234189345c4696cc2759e +Author: Simon McVittie +Date: 2006-09-27 13:50:07 +0100 + + dbus/extract.py: Remove (no longer used now we're not using Pyrex) + +D dbus/extract.py + +commit b4d4ab76adabd4a8d0a14efa678c057f51d23431 +Author: Simon McVittie +Date: 2006-09-27 13:30:49 +0100 + + Extend and correct docstrings. Set epydoc to expect reStructuredText + by default. + +M Makefile +M _dbus_bindings/conn-methods-impl.h +M _dbus_bindings/message-append-impl.h +M _dbus_bindings/message-get-args-impl.h +M _dbus_bindings/validation-impl.h + +commit 78a7b67f03f9267fd47ab3686f971d1190cadf1a +Author: Simon McVittie +Date: 2006-09-27 13:03:26 +0100 + + Cast to PyCFunction to avoid compiler warning for function with kwargs + +M _dbus_bindings/module.c + +commit 274b4601130abb67b5b7f68de38c71ee7a64d3fb +Author: Simon McVittie +Date: 2006-09-27 13:02:53 +0100 + + Correct argument parsing in validate_bus_name + +M _dbus_bindings/validation-impl.h + +commit b235e382198fc7599a2183a5b4cba10f650659bc +Author: Simon McVittie +Date: 2006-09-27 13:00:58 +0100 + + setup.py: Remove _util from modules to install + +M setup.py + +commit cdc40aa20b52b4a8e9910e8fe48824205b4e7591 +Author: Simon McVittie +Date: 2006-09-27 12:50:06 +0100 + + _dbus_bindings: Expose name-validation functions to Python code. + dbus: Remove _util module in favour of using the name-validation + functions + from _dbus_bindings. + +M _dbus_bindings/module.c +M _dbus_bindings/validation-impl.h +D dbus/_util.py +M dbus/decorators.py + +commit 9c7ee716288ffc80d1c931c84cc2b3242acf0b1e +Author: Simon McVittie +Date: 2006-09-27 12:47:55 +0100 + + Minor docstring correction + +M _dbus_bindings/types-impl.h + +commit 4c53d31fcc5b2f3a8e5578cae57e51db84a396fb +Author: Simon McVittie +Date: 2006-09-27 12:47:27 +0100 + + _dbus_bindings/message-get-args-impl: Fix ByteArray unmarshalling. + +M _dbus_bindings/message-get-args-impl.h + +commit aa5cb1a66951705540a51645eb8efd3cbcf6788e +Author: Simon McVittie +Date: 2006-09-27 12:45:58 +0100 + + dbus/_dbus.py: Now that Bus subclasses Connection, simplify signature + of signal filter + +M dbus/_dbus.py + +commit 747b2b9d37329796c4bf0bdaa1ca99e1d82d420d +Author: Simon McVittie +Date: 2006-09-27 11:55:46 +0100 + + Add a test case for the various options to get_args_list. + Fix ByteArray unmarshalling. + +M test/test-standalone.py + +commit de8aeda1687948230bb97fa4083744087356e738 +Author: Simon McVittie +Date: 2006-09-27 11:01:18 +0100 + + .gitignore: Ignore MANIFEST, dist/ + +M .gitignore + +commit a7bcad2d2239e28bb32ef7cfe74105c514a32ee5 +Author: Simon McVittie +Date: 2006-09-27 11:00:35 +0100 + + _dbus_bindings/module.c: PEP7-style whitespace + +M _dbus_bindings/module.c + +commit 888110c46b864b613a3281e3d0bf76ed85b04b01 +Author: Simon McVittie +Date: 2006-09-27 10:59:01 +0100 + + _dbus_bindings/module.c: Add __docformat__, top-level docstring. + Also don't abort() if adding constants to the module fails. + +M _dbus_bindings/module.c + +commit 552b7b4c997ea44de86f68e79341ecf323b9ead5 +Author: Simon McVittie +Date: 2006-09-27 10:44:25 +0100 + + MANIFEST.in: Include added files, stop trying to include the Pyrex + version + +M MANIFEST.in + +commit 84be4d92f3f913f04941562ffb4cde5d21a63b37 +Author: Simon McVittie +Date: 2006-09-27 10:43:21 +0100 + + Makefile, setup.py: Stop forcing -O0 -g + +M Makefile +M setup.py + +commit 78ce34da2c1cea65372b96505e21529d3896634f +Author: Simon McVittie +Date: 2006-09-27 10:38:44 +0100 + + Remove the Pyrex implementation of dbus_bindings and + dbus_glib_bindings + +D dbus/_dbus_bindings-exceptions.pxi +D dbus/_dbus_bindings-types.pxi +D dbus/_dbus_bindings.pxd.in +D dbus/_dbus_bindings.pyx +D dbus/_dbus_glib_bindings.pyx +D dbus/dbus_h_wrapper.h + +commit 97d01a1d540e5ec31b752c31ad9f2b794eddf472 +Author: Simon McVittie +Date: 2006-09-26 20:50:58 +0100 + + Throughout dbus-python: Use the C implementation. + Add document API_CHANGES.txt listing visible API changes. + Add more test cases, for low-level Python <-> D-Bus type mappings. + Amend existing test cases to cope with the API changes. + +A API_CHANGES.txt +M dbus/_dbus.py +M dbus/decorators.py +M dbus/exceptions.py +M dbus/proxies.py +M dbus/service.py +M dbus/types.py +M setup.py +M test/cross-test-client.py +M test/cross-test-server.py +M test/run-test.sh +M test/test-client.py +M test/test-service.py +A test/test-standalone.py + +commit e0552c3d9cfe22e9ea1b3c2874dc4f79d6948b21 +Author: Simon McVittie +Date: 2006-09-26 20:48:55 +0100 + + _dbus_bindings: Correct get_args -> get_args_list change + +M _dbus_bindings/message-get-args-impl.h +M _dbus_bindings/message-impl.h + +commit 030e4fe368e976cb20d223d45ae787c12686b3f4 +Author: Simon McVittie +Date: 2006-09-26 19:30:58 +0100 + + _dbus_bindings/message-get-args-impl.h: Revert gratuitous API change + Message has a method get_args_list() returning a list again, + rather than + a method get_args() returning a tuple. + +M _dbus_bindings/message-get-args-impl.h + +commit 24eb072bd8aabbc4d0f916b981e2283be0848e97 +Author: Simon McVittie +Date: 2006-09-26 19:27:24 +0100 + + dbus/matchrules.py: Use absolute import + +M dbus/matchrules.py + +commit 97900c452754b832d0817edc03f3e00fe888d24a +Author: Simon McVittie +Date: 2006-09-26 18:53:55 +0100 + + Add a C reimplementation of the formerly-Pyrex bits of dbus-python. + +A HACKING.txt +A _dbus_bindings/bus-impl.h +A _dbus_bindings/bytes-impl.h +A _dbus_bindings/conn-impl.h +A _dbus_bindings/conn-methods-impl.h +A _dbus_bindings/containers-impl.h +A _dbus_bindings/dbus_bindings.py +A _dbus_bindings/debug-impl.h +A _dbus_bindings/exceptions-impl.h +A _dbus_bindings/generic-impl.h +A _dbus_bindings/message-append-impl.h +A _dbus_bindings/message-get-args-impl.h +A _dbus_bindings/message-impl.h +A _dbus_bindings/module.c +A _dbus_bindings/pending-call-impl.h +A _dbus_bindings/signature-impl.h +A _dbus_bindings/test.py +A _dbus_bindings/types-impl.h +A _dbus_bindings/validation-impl.h +A _dbus_glib_bindings/module.c +A include/dbus_bindings.h + +commit 0a189b73baa8e7b1d1d7743534b635fabe1aaf80 +Author: Simon McVittie +Date: 2006-09-26 18:43:04 +0100 + + Add Makefile rule to do a clean build (setup.py doesn't track .h + dependencies properly) and make it the default + +M Makefile + +commit d1e74259da30f732ebf58057188478367b492840 +Author: Simon McVittie +Date: 2006-09-26 18:42:16 +0100 + + Add self to AUTHORS + +M AUTHORS + +commit 3b1b6ec26d55e08c4a9fbed12714913974f8e0c3 +Author: Simon McVittie +Date: 2006-09-08 18:10:06 +0100 + + dbus/service.py, dbus/_dbus_bindings-types.pxi: Move VariantSignature + As it's only used in dbus.service, there is no reason for + VariantSignature + to be written in Pyrex. + +M dbus/_dbus_bindings-types.pxi +M dbus/service.py + +commit 6e0e797a2c354d1cdd2e940ec2ab25614ac49f6f +Author: Simon McVittie +Date: 2006-09-08 18:08:27 +0100 + + dbus/_dbus_bindings.pyx: More docstrings + +M dbus/_dbus_bindings.pyx + +commit 82c249159bbbfa1ad1d77d26b8e3a2f0615a80ee +Author: Simon McVittie +Date: 2006-09-08 18:08:04 +0100 + + dbus/proxies.py: Set __docformat__ to 'restructuredtext' for epydoc + +M dbus/proxies.py + +commit 3f77ab99f21400fbea5642affff2e8bc0c8faf28 +Author: Simon McVittie +Date: 2006-09-08 18:07:23 +0100 + + dbus/_dbus.py: More docstrings + +M dbus/_dbus.py + +commit d65d0b6654b19522e250a6a4a361f06fa1ccd2d2 +Author: Simon McVittie +Date: 2006-09-07 13:21:48 +0100 + + _dbus_bindings: split out types, exceptions into separate source files + +A dbus/_dbus_bindings-exceptions.pxi +A dbus/_dbus_bindings-types.pxi +M dbus/_dbus_bindings.pyx + +commit 346e0f0f332f5e112726536c434535a40072f356 +Author: Simon McVittie +Date: 2006-09-06 13:42:13 +0100 + + Add a fairly simplistic implementation of the D-Bus bindings test + suite. + Currently only tested with Python <-> Python, and some of the Byte + tests fail + until I get an opinion from the list on whether the API should be + in terms + of strings-of-length-1, ints, or both. + +M Makefile +A test/cross-test-client.py +A test/cross-test-server.py +A test/crosstest.py + +commit dc7cea8740b53c7a7061a2392cdc7ec775dd3734 +Author: Simon McVittie +Date: 2006-09-06 13:30:13 +0100 + + _dbus_bindings.pyx: Documentation + * Add more docstrings and note methods which I don't think should + be public. + * When append_byte() fails, raise a more informative TypeError + +M dbus/_dbus_bindings.pyx + +commit e37b430efed0dcfa5ff6196046e0b4302b79662a +Author: Simon McVittie +Date: 2006-09-06 13:26:58 +0100 + + dbus/_dbus.py: Add exceptions to __all__ so they'll be imported + into __init__ + +M dbus/_dbus.py + +commit 99bd2cf0aad0f26cc41459be2c89256f226832f0 +Author: Simon McVittie +Date: 2006-09-06 13:26:24 +0100 + + dbus/__init__.py: Annotate __all__ with where the objects come from + +M dbus/__init__.py + +commit c0574acbc663094fbb722cd6bdc97b02e7111100 +Author: Simon McVittie +Date: 2006-09-01 16:24:46 +0100 + + _dbus_bindings.pyx: Spell "negative" correctly + +M dbus/_dbus_bindings.pyx + +commit cf1599248d81b848016672cc129a714095f5f11e +Author: Simon McVittie +Date: 2006-09-01 16:22:57 +0100 + + test/test-client.py: Rename dbus.dbus_bindings to _dbus_bindings in + test too + +M test/test-client.py + +commit 9c4ad587bb237921ff49ac78581eb66a863e6105 +Author: Simon McVittie +Date: 2006-09-01 16:21:55 +0100 + + .gitignore: Add files generated during test + +M .gitignore + +commit fc2c0c457100003c4b2c85d6202d75e796b89454 +Author: Simon McVittie +Date: 2006-09-01 16:14:21 +0100 + + _dbus_bindings.pyx: Remove no-op constructor overrides which just + use superclass + +M dbus/_dbus_bindings.pyx + +commit 188e54fd97c48d9183a16cc2373de62a60f36a39 +Author: Simon McVittie +Date: 2006-09-01 15:56:16 +0100 + + .gitignore: Amend for renaming of dbus_bindings + +M .gitignore + +commit 10186487194e31889f0a255f7986577b169220ac +Author: Simon McVittie +Date: 2006-09-01 15:54:47 +0100 + + dbus._dbus, _dbus_bindings, dbus.proxies: Add docstrings + +M dbus/_dbus.py +M dbus/_dbus_bindings.pyx +M dbus/proxies.py + +commit 867c2dd9318c8cbaf810d23d5f2a332d091007d9 +Author: Simon McVittie +Date: 2006-08-31 18:14:40 +0100 + + Makefile: add. Makefile for developer convenience, currently does + API documentation using epydoc + +A Makefile + +commit bb8600d38b16999d08950a03473f03d8705394bf +Author: Simon McVittie +Date: 2006-08-31 18:13:39 +0100 + + dbus._dbus: add __all__ + +M dbus/_dbus.py + +commit 5098824725bc8984e4a84f2bede278648941960d +Author: Simon McVittie +Date: 2006-08-31 18:13:07 +0100 + + dbus.types: add __all__ + +M dbus/types.py + +commit 656bb219b37ac18ad9bc953ac9a2fb2b5fa6234d +Author: Simon McVittie +Date: 2006-08-31 18:09:23 +0100 + + dbus/__init__.py: Add __all__ (listing a sensible set of public API), + __docformat__, __version__ + +M dbus/__init__.py + +commit aac6f58ae96faab86e6080702d2dac2bd3a69d66 +Author: Simon McVittie +Date: 2006-08-31 18:05:57 +0100 + + Rename dbus_bindings (sometimes a.k.a. dbus.dbus_bindings) to + _dbus_bindings. + Ditto for dbus_glib_bindings. + Remove dbus.pth - should no longer be needed after this change. + +M dbus/_dbus.py +R100 dbus/dbus_bindings.pxd.in dbus/_dbus_bindings.pxd.in +R100 dbus/dbus_bindings.pyx dbus/_dbus_bindings.pyx +R068 dbus/dbus_glib_bindings.pyx dbus/_dbus_glib_bindings.pyx +D dbus/dbus.pth +M dbus/decorators.py +M dbus/exceptions.py +M dbus/glib.py +M dbus/matchrules.py +M dbus/proxies.py +M dbus/service.py +M dbus/types.py +M setup.py + +commit c51b148077479381844a84989292719417c543b2 +Author: Simon McVittie +Date: 2006-08-30 20:15:07 +0100 + + Add some docstrings (reStructuredText with epydoc annotations) + +M dbus/__init__.py +M dbus/_dbus.py +M dbus/decorators.py +M dbus/exceptions.py +M dbus/service.py + +commit 00435b5adc76a745e17b13386d15a2a1d6b2bb16 +Author: Simon McVittie +Date: 2006-08-30 20:12:08 +0100 + + .gitignore: Add. Ignore distutils build dir, Python bytecode, Vim + swapfiles, and generated ChangeLog, .pxd and .c files. + +A .gitignore + +commit 1b1d5b77a841e68043fd1f27900b7b97b4610b33 +Author: John (J5) Palmieri +Date: 2006-07-27 14:00:14 -0400 + + * dbus/BusName.py (BusName::__new__): Modified patch from Alex Jones + - Add flags when requesting a name + +M dbus/service.py + +commit eae6cd4e466d9d6dd477cf0bb5ef2b183f4c69f9 +Author: John (J5) Palmieri +Date: 2006-07-27 13:57:56 -0400 + + * setup.py: read the stdout pipe before stderr + +M setup.py + +commit f5258f571de77b18354e17073d44f316d1e0af1b +Author: John (J5) Palmieri +Date: 2006-07-27 12:40:36 -0400 + + * setup.py: some distros have older gits which don't have the + git-log --stat + flag. We check for an error and if so revert to just calling + git-log + +M setup.py + +commit 49948f1f9554b4431d668992b4953ff09962149f +Author: John (J5) Palmieri +Date: 2006-07-24 14:34:51 -0400 + + * Released 0.71 + +M NEWS +M setup.py + +commit 29b7548ddf4400a20636ae558c1834ad523c33da +Author: John (J5) Palmieri +Date: 2006-07-24 14:05:26 -0400 + + * Patch from Joseph Sacco : + Export the correct cflags in distutils + +M setup.py +M test/run-test.sh + +commit 5f76b5a3eec271192e9657213c6693121c3d8df9 +Author: John (J5) Palmieri +Date: 2006-07-21 17:17:46 -0400 + + * fix import of dbus_bindings + +M test/test-client.py + +commit 163206f228efad53051677a08d3813fcc5d0ab97 +Author: John (J5) Palmieri +Date: 2006-07-21 16:42:54 -0400 + + * Automate building of ChangeLog + +M setup.py + +commit f262d88279991faba06578dde48d0c607ce4b0b8 +Author: John (J5) Palmieri +Date: 2006-07-21 16:27:59 -0400 + + * fixed where the binary modules are installed into + +M setup.py + +commit 7d73bb0ea7631ce1191de1cd6fbbcb07fe215f31 +Author: John (J5) Palmieri +Date: 2006-07-17 16:58:42 -0400 + + * Released 0.70 + * Added NEWS to the dist + +M MANIFEST.in +A NEWS + +commit 8728a13fa422955aa96bf2d8644af773407dbe65 +Author: John (J5) Palmieri +Date: 2006-07-17 16:43:42 -0400 + + * remove ChangeLog as it will be generated by git-whatchanged + +D ChangeLog + +commit caaabe86ac7a91c84d022c5806e67a42617fa566 +Author: John (J5) Palmieri +Date: 2006-07-14 12:52:53 -0400 + + * Add Osvaldo S. Neto to AUTHORS for his distutils patch + +M AUTHORS + +commit 4b1d99c3fbf0d402cb7badbcb8e6ea682f7e54c6 +Author: John (J5) Palmieri +Date: 2006-07-12 21:40:13 -0400 + + * MANIFEST.in: + added the tools directory + +M MANIFEST.in + +commit 9c70ef78b9368b5fd090dd3aafb3f189cc88616d +Author: John (J5) Palmieri +Date: 2006-07-12 21:32:57 -0400 + + * run-test.sh: + create the .service file before we launch dbus + +M test/run-test.sh + +commit 7a0389c01ac8c775b7b677bcc20cc0da716b1c19 +Author: John (J5) Palmieri +Date: 2006-07-12 21:28:39 -0400 + + * Add tests back + * create a check command for distutils (python setup.py check) + +M MANIFEST.in +M setup.py +A test/dbus_python_check.py +A test/run-test.sh +A test/test-client.py +A test/test-service.py +A tools/run-with-tmp-session-bus.sh +A tools/session.conf + +commit 303a9d690767dd40e75940f9e3c4e1d1fa504554 +Author: John (J5) Palmieri +Date: 2006-07-12 18:11:07 -0400 + + * MANIFEST.in: Added + * setup.py: change package name to dbus-python + +A MANIFEST.in +M setup.py + +commit c72e8df76cda925d0bac0e99af94a4d3760e74b1 +Author: John (J5) Palmieri +Date: 2006-07-12 17:34:58 -0400 + + * dbus/dbus_glib_bindings.pyx: Prepend includes dbus-glib.h and + dbus-glib-lowlevel withd dbus/ since we are no longer building in + tree and + need to get the system's header files + +M dbus/dbus_glib_bindings.pyx + +commit 98bdb18235a405339041596c571f213ea5fa3c24 +Author: John (J5) Palmieri +Date: 2006-07-12 17:29:04 -0400 + + - s/dbus/-Idbus\// in includedirs_flag + +M setup.py + +commit 82a4e8afb8ca163416f602fdb1df96b11765ecb2 +Author: Robert McQueen +Date: 2006-07-12 21:53:57 +0100 + + setup.py, dbus/extract.py: Patch from Osvaldo Santana Neto + to make the python bindings build + and install + with distutils. Not quite working yet because of path madness with the + extract.py stuff. + +M dbus/extract.py +A setup.py + +commit 172f80244f21a681609e6918c1f043b3272949f3 +Author: Robert McQueen +Date: 2006-07-12 19:40:37 +0100 + + dbus/__init__.py: Set version to 0.70. + +M dbus/__init__.py + +commit fb63da94f9e207e807f7f0ae18425d3b73173d43 +Author: Robert McQueen +Date: 2006-07-12 19:28:30 +0100 + + dbus/Makefile.am, dbus/examples/Makefile.am: removed + +D dbus/Makefile.am +D dbus/examples/Makefile.am + +commit cc9eb8989a5782f62f8ca786d76e1267e48ec8bf +Author: Robert McQueen +Date: 2006-07-12 19:26:39 +0100 + + Move python/ to dbus/, the name of the module. + +R100 python/.cvsignore dbus/.cvsignore +R100 python/Makefile.am dbus/Makefile.am +R100 python/__init__.py dbus/__init__.py +R100 python/_dbus.py dbus/_dbus.py +R100 python/_util.py dbus/_util.py +R100 python/dbus.pth dbus/dbus.pth +R100 python/dbus_bindings.pxd.in dbus/dbus_bindings.pxd.in +R100 python/dbus_bindings.pyx dbus/dbus_bindings.pyx +R100 python/dbus_glib_bindings.pyx dbus/dbus_glib_bindings.pyx +R100 python/dbus_h_wrapper.h dbus/dbus_h_wrapper.h +R100 python/decorators.py dbus/decorators.py +R100 python/examples/.cvsignore dbus/examples/.cvsignore +R100 python/examples/Makefile.am dbus/examples/Makefile.am +R100 python/examples/example-client.py +dbus/examples/example-client.py +R100 python/examples/example-service.py +dbus/examples/example-service.py +R100 python/examples/example-signal-emitter.py +dbus/examples/example-signal-emitter.py +R100 python/examples/example-signal-recipient.py +dbus/examples/example-signal-recipient.py +R100 python/examples/gconf-proxy-client.py +dbus/examples/gconf-proxy-client.py +R100 python/examples/gconf-proxy-service.py +dbus/examples/gconf-proxy-service.py +R100 python/examples/gconf-proxy-service2.py +dbus/examples/gconf-proxy-service2.py +R100 python/examples/list-system-services.py +dbus/examples/list-system-services.py +R100 python/exceptions.py dbus/exceptions.py +R100 python/extract.py dbus/extract.py +R100 python/glib.py dbus/glib.py +R100 python/introspect_parser.py dbus/introspect_parser.py +R100 python/matchrules.py dbus/matchrules.py +R100 python/proxies.py dbus/proxies.py +R100 python/service.py dbus/service.py +R100 python/types.py dbus/types.py + +commit 260a7da603a0449a117690a9cc46c7d171ec1112 +Author: Robert McQueen +Date: 2006-07-12 19:25:47 +0100 + + COPYING: Have the file with its contents and not a file full of NULLs + (thanks XFS) + +M COPYING + +commit 85ef4b2f21a67fa6f8ebb7977fc62a69208d86fe +Author: Robert McQueen +Date: 2006-07-12 19:24:09 +0100 + + AUTHORS, COPYING: Copy from old tree. + +A AUTHORS +A COPYING + +commit 7d136b1b7749b9d52703f00f546524a8967aeebc +Author: John (J5) Palmieri +Date: 2006-03-02 23:28:18 +0000 + + 2006-03-02 John (J5) Palmieri + + * python/dbus_bindings.pyx: Remove refrence to sys/cdefs.h + (Patch from Artem Kachitchkine ) + +M python/dbus_bindings.pyx + +commit 6387ac0ee38cbc2c613f1ec6b481693451e6a1d6 +Author: John (J5) Palmieri +Date: 2006-02-24 18:18:41 +0000 + + 2006-02-24 John (J5) Palmieri + + * Released 0.61 + + 2006-02-24 John (J5) Palmieri + + * proxies.py: Fix the callchain + +M python/proxies.py + +commit 7ce7ad66afac2b35ddab72190d31c8470a2e4d2d +Author: Robert McQueen +Date: 2006-02-15 23:45:48 +0000 + + 2006-02-16 Robert McQueen + + * glib/dbus-gmain.c: Make the previous commit compile. + + * python/_dbus.py, python/matchrules.py: Patch from Ole Andre + Ravnaas to allow you to + specify sender_keyword="foo", path_keyword="bar" when adding + a signal listener, so that you can bind to signals generically + but still do something useful in your callback. + + * python/dbus_bindings.pyx: Demarshal the byte type as unsigned + chars so that they're not cast to chars and made negative. Thanks + to Jakub Stachowski for reporting this and testing the fix. + +M python/_dbus.py +M python/dbus_bindings.pyx +M python/matchrules.py + +commit 62f127585556aeb828c0114225859bddc8d08aa3 +Author: Robert McQueen +Date: 2005-12-06 12:38:07 +0000 + + 2005-12-06 Robert McQueen + + * python/service.py: s/sucessful/successful/ so we're allocating + to + and reading from the same variable. Oops. + +M python/service.py + +commit e48f4d56533ef815d05e05b31128e53640bd7ded +Author: Robert McQueen +Date: 2005-11-27 17:44:19 +0000 + + 2005-11-27 Robert McQueen + + * python/dbus_bindings.pyx: Repair my previous commit which + reverted + part of the preceding one. Oops. Merge patch by Johan Hedberg + to fix marshalling of 16-bit integer + values + on big-endian platforms. + + * test/python/test-client.py: Add some 16-bit integers to the test + values. + +M python/dbus_bindings.pyx + +commit b5df8fdfae7b488156cef4ccc536523bfb892895 +Author: Robert McQueen +Date: 2005-11-27 16:55:09 +0000 + + 2005-11-27 Carlos Garcia Campos + + * glib/dbus-gobject.c: Append a GValue instead of a basic type in + method return message for property getters + +M python/dbus_bindings.pyx + +commit e9046cf6eabcc6e9f86e6dc8cb73a0b28ccc3347 +Author: Robert McQueen +Date: 2005-11-27 16:40:57 +0000 + + 2005-11-27 Robert McQueen + + * python/dbus_bindings.pyx: Fix a bug where doing a strict append + with type v of an instance of dbus.Variant(foo, type='x') caused + it to be boxed twice before sending over the bus. + + * python/dbus_bindings.pyx, python/service.py, + test/python/test-client.py: Update the constants for the new + request_name flags, and update comments/test cases now that + queueing + is the default action. + +M python/dbus_bindings.pyx +M python/service.py + +commit c38a568a59493a798164c2449f7774586fd236f3 +Author: Robert McQueen +Date: 2005-11-15 17:19:19 +0000 + + 2005-11-15 Robert McQueen + + * bus/driver.c, bus/services.c, bus/services.h: Add a ReleaseName + method to org.freedesktop.DBus to release a bus name or give up + waiting in the queue for it. + + * dbus/dbus-bus.c, dbus/dbus-bus.h, dbus/dbus-shared.h: Add a + dbus_bus_release_name method to send the ReleaseName method calls. + Add constants for the return values to dbus/dbus-shared.h. + + * doc/dbus-specification.xml: Document the new ReleaseName method + in the specification. + + * python/dbus_bindings.pyx: Add a low-level python binding for the + release name method. + + * python/exceptions.py, python/service.py: Make freeing BusName + objects release the name. Add a NameExistsException, and fix a + bug with creating UnknownMethodException. + + * test/python/test-client.py: Add tests for freeing BusName + objects causing names to be released. + +M python/dbus_bindings.pyx +M python/exceptions.py +M python/service.py + +commit e6351798aca627adba6e3dad43a605482b63a43e +Author: Robert McQueen +Date: 2005-11-14 20:59:32 +0000 + + 2005-11-15 Robert McQueen + + * python/service.py: Include the traceback in the error reply + when we + send an exception over the bus. _BEST_ _PATCH_ _EVER_ + +M python/service.py + +commit 321ace3a0cf031e638bba1d753818ac068672dee +Author: Robert McQueen +Date: 2005-11-14 02:53:29 +0000 + + 2005-11-14 Robert McQueen + + * python/decorators.py, python/service.py: Add a new argument + to the + dbus.service.method decorator called sender_keyword, which if set, + specifies the name of an argument which will be provided the bus + name of the method caller. + + * test/python/test-client.py, test/python/test-service.py: Add a + method and test to check the sender_keyword functionality. + +M python/decorators.py +M python/service.py + +commit cb37041d6ffeab9e7623dd7c51acc64cbaa7534d +Author: Robert McQueen +Date: 2005-11-07 15:31:30 +0000 + + 2005-11-07 Robert McQueen + + * python/decorators.py: Change emit_signal function to use the + signature annotation of the signal when marhsalling the arguments + from + the service. Fix a bug where the code checking signature length + against argument length referenced the wrong variable. + + * python/introspect_parser.py: Avoid adding the type signature of + signal arguments to any methods which occur after them in the + introspection data (!) by making the parser a little more careful + about its current state. + + * python/service.py: Remove debug prints from last commit + (again :D). + + * test/python/test-client.py, test/python/test-service.py: + Add test + signals with signature decorators to test the strict marshalling + code + gives errors at the right time. Could do with checking the signals + actually get emitted too, given that the test does nothing with + signals at the moment... + +M python/decorators.py +M python/introspect_parser.py +M python/service.py + +commit 792849028648dfc9fd0513c855b0ea9001a9ea04 +Author: Robert McQueen +Date: 2005-11-07 12:14:52 +0000 + + 2005-11-07 Robert McQueen + + * python/_dbus.py: Add WeakReferenceDictionary cache of dbus.Bus + instances to stop madness of creating new instances representing + the same bus connection all the time, rendering any tracking of + match rules and bus names quite meaningless. Caught a bug where + the private argument to SessionBus() and friends was being passed + in as use_default_mainloop by mistake. Still some problems with + multiple dbus_binding.Connection instances representing the same + low-level connection (eg when you use both SessionBus() and + StarterBus() in same process), but it's a lot better now than it + was. + + * python/dbus_bindings.pyx: Add constants with the return values + for bus_request_name(). + + * python/service.py: Store bus name instances in a per-dbus.Bus + cache + and retrieve the same instances for the same name, so deletion + can be + done with refcounting. Also now throws some kind of error if you + don't actually get the name you requested, unlike previously... + + * test/python/test-client.py: Add tests for instance caching + of buses + and bus name objects. + +M python/_dbus.py +M python/dbus_bindings.pyx +M python/service.py + +commit c6d4440b37c43681a4ecf11edfa5a4b0371734ea +Author: Robert McQueen +Date: 2005-11-04 12:17:54 +0000 + + 2005-11-04 Robert McQueen + + * python/dbus_bindings.pyx, test/python/test-client.py: Fix + marshalling of boolean values. Add some booleans to the + values in + the test client. + + * python/decorators.py, python/service.py: Add an + 'async_callbacks' + argument to the dbus.service.method decorator, which allows + you to + name arguments to take two callback functions for replying + with + return values or an exception. + + * test/python/test-client.py, test/python/test-service.py: + Add test + case using asynchronous method reply functions, both return + values and + errors, and from within both the function itself and from + a mainloop + callback. + + * python/decorators.py, python/service.py: Perform checking + that the + number of method/signal arguments matches the number of + types in the + signature at class loading time, not when you first + introspect the + class. + + * python/service.py: Remove debug print left by the last + commit. + +M python/dbus_bindings.pyx +M python/decorators.py +M python/service.py + +commit fcbc5d45112bd16c9ff8f6ead36d89a6c6381dc8 +Author: Robert McQueen +Date: 2005-11-03 21:47:31 +0000 + + 2005-11-03 Robert McQueen + + * python/service.py: Heavy refactoring of method invocation, + with + hopefully no effect on functionality. Nuked + _dispatch_dbus_method_call + in favour of a new _message_cb that uses seperate functions + for + looking up the method to call, marshalling the return + values, and + sending exceptions as errors, and is easier to follow as a + consequence. Fixes some corner cases about returning + things that + don't match your declared out_signature, allows exceptions + to define + _dbus_error_name and have it be sent over the bus as the + error name, + and paves the way for cool stuff like heeding the message + no reply + flag, asynchronous method implementations, informing the + method of the + sender, and including backtraces in the error messages. + + * test/python/test-client.py: Catch and print exceptions + thrown in the + async callback tests, rather than passing them to the + low-level + bindings to be ignored in a noisy and frustrating manner. + +M python/service.py + +commit b4a92c736cb37f2daba25283e830615dcf7137e8 +Author: Robert McQueen +Date: 2005-11-03 16:13:52 +0000 + + 2005-11-03 Robert McQueen + + * python/_dbus.py, python/proxies.py, python/service.py: + Add __repr__ + functions to dbus.Bus, dbus.service.BusName and + dbus.service.Object, + tweak others to be consistent. + + * test/python/test-client.py: Tweak output of testInheritance. + +M python/_dbus.py +M python/proxies.py +M python/service.py + +commit cd40a2db923dc01ee80f4827dfd3e102a98a64ec +Author: Robert McQueen +Date: 2005-10-29 22:41:07 +0000 + + 2005-10-29 Robert McQueen + + * python/service.py: Major changes to allow multiple + inheritance + from classes that define D-Bus interfaces: + + 1. Create a new Interface class which is the parent class of + Object, and make the ObjectType metaclass into + InterfaceType. + + 2. Patch written with Rob Taylor to replace use of + method_vtable + with code that walks the class's __MRO__ (method + resolution order) + to behave like Python does when invoking methods and allow + overriding as you'd expect. Code is quite tricky because + we have to find two methods, the one to invoke which + has the + right name and isn't decorated with the /wrong/ interface, + and the one to pick up the signatures from which is + decorated + with the right interface. + + The same caveats apply as to normal multiple inheritance - + this has undefined behaviour if you try and inherit + from two + classes that define a method with the same name but are + decorated with different interfaces. You should decorate + your overriding method with the interface you want. + + 3. Replace grungy introspection XML generation code in + the metaclass + with dictionaries that cope correctly with multiple + inheritance + and the overriding of methods. This also uses the + signature + decorations to provide correct introspection data, + including + the debut appearance of the types of your return + values. :D + + * test/python/test-client.py, test/python/test-service.py: + Add a test + case to try invoking an method that overrides one inherited + from a + D-Bus interface class. + +M python/service.py + +commit f14661ee73a5efc92dfcbe22e4230dab153a4d69 +Author: Robert McQueen +Date: 2005-10-29 22:04:01 +0000 + + 2005-10-29 Robert McQueen + + * python/dbus_bindings.pyx: Tweak 'raise AssertionError' + to assert(). + Add checking for the end of struct character when + marshalling a + struct in MessageIter.append_strict. + + * python/examples/example-service.py, + python/examples/gconf-proxy-service.py, + python/examples/gconf-proxy-service2.py: Update to use gobject + mainloop directly rather than appearing to depend on gtk. + + * python/test/test-client.py, python/test/test-server.py: + Remove + obsolete and broken test scripts for old bindings. We have + up to date + and working tests in test/python/. + +M python/dbus_bindings.pyx +M python/examples/example-service.py +M python/examples/gconf-proxy-service.py +M python/examples/gconf-proxy-service2.py +D python/tests/test-client.py +D python/tests/test-server.py + +commit a10facab362212f630b4fc3191a711523ed367b1 +Author: Robert McQueen +Date: 2005-10-29 19:13:17 +0000 + + 2005-10-29 Robert McQueen + + * python/decorators.py: Add optional arguments to the + method and + signal decorators to allow you to specify the signature + of arguments + and return values. Preserve the doc strings of signal + functions in the + decorated version, for pydoc and friends. + + * python/dbus_bindings.pyx, python/proxies.py: Replace the + parse_signature_block function with an iterable + dbus.Signature() + type. Fix a bug in MessageIter.append_strict where you + could append + anything by claiming it was a string. + + * python/service.py: Use the out_signature decoration on + methods to + marshal return values, meaning you no longer require + dbus.Array() + or dbus.Dictionary() to indicate the type when returning empty + arrays or dictionaries. Fix a bug where exceptions which + are defined + in __main__ are not turned into error replies. + + * test/python/test-client.py, test/python/test-service.py: + Add test + for correct marshalling of return values according to + out_signature. + Fix a bug in the async call test where the error_handler is + missing a + self argument. + +M python/dbus_bindings.pyx +M python/decorators.py +M python/proxies.py +M python/service.py + +commit b07e4f860f8d9ff323558e8276dbda346a09b3b1 +Author: Robert McQueen +Date: 2005-10-24 18:29:50 +0000 + + 2005-10-24 Robert McQueen + + * python/dbus_bindings.pyx (String, MessageIter): make D-Bus + strings + derive from unicode instead of str, and encode/decode UTF-8 when + marshalling/unmarshalling bus messages + + * python/introspect_parser.py: encode introspection data as UTF-8 + before passing the buffer into libxml2 + + * test/python/test-client.py: add unicode test strings + + * test/data/valid-service-files/.cvsignore, + test/python/.cvsignore: + ignore generated python test files + +M python/dbus_bindings.pyx +M python/introspect_parser.py + +commit 5b923c8dd10dc21e7f03aa8e27d1bb30652fb5da +Author: John (J5) Palmieri +Date: 2005-10-18 04:38:04 +0000 + + * glib/dbus-gvalue-utils.c (hash_free_from_gtype): handle gdouble + + and G_TYPE_VALUE_ARRAY (DBUS_TYPE_STRUCT) + (gvalue_from_hash_value, hash_value_from_gvalue): handle gdouble + + * glib/dbus-gvalue.c (dbus_gvalue_to_signature): add missing + DBUS_STRUCT_BEGIN_CHAR and DBUS_STRUCT_END_CHAR charaters + when constructing struct signatures + + * python/_dbus.py (Bus): handle private connections using the + private keyword in the constructor. defaults to private=False + (Bus::close): new method to close a connection to the bus + + * python/dbus_bindings.pyx (Connection::close): renamed method + was previously called disconnect + (bus_get): now supports getting a private connection + + * python/proxies.py (ProxyMethod::__call__): check if ignore_reply + keyword is set to True. if it is, execute the method without waiting + for a reply + (ProxyObject::_introspect_execute_queue): new method for executing + all the pending methods that were waiting for the introspect to + finish. this is called when introspect either succeeds or fails + (ProxyObject::_introspect_error_handler): call queued methods + +M python/_dbus.py +M python/dbus_bindings.pyx +M python/proxies.py + +commit cb8652321a7b3791f54a6fb1ebf1675aac9ac33d +Author: John (J5) Palmieri +Date: 2005-10-14 21:44:00 +0000 + + * python/dbus_bindings.pyx (MessageIter::append_strict): check for + STRUCT_BEGIN not TYPE_STRUCT in indicate we are marshalling a struct + + * python/service.py (Object::_message_cb): handle exceptions correctly + by sending them over the wire to the calling app. This makes sure + the client returns immediately instead of waiting the 15 seconds to + timeout. + + * test/python/test-client.py + (TestDBusBindings::testBenchmarkIntrospect): + Add a test to benchmark how long it takes to introspect a service + and + call a method which returns a large element (pretty fast) + + * test/python/test-service.py (TestObject::GetComplexArray): new test + method which pushes a lot of data + +M python/dbus_bindings.pyx +M python/service.py + +commit d468280ea6cf7be2c3729a182f3c252fd2a7b999 +Author: John (J5) Palmieri +Date: 2005-10-13 23:34:11 +0000 + + * python/service.py(ObjectType::_reflect_on_signal, + _reflect_on_method): + + reclaim memory outside of the loop and use del istead of just setting + the key to None + +M python/service.py + +commit fb3300cea133630f45d13776a66dcbbd71c46d97 +Author: John (J5) Palmieri +Date: 2005-10-13 23:26:00 +0000 + + * python/service.py (ObjectType::_reflect_on_signal): Always close + + signal tag even when there are no arguments + +M python/service.py + +commit 137d6a5121de6ae44a37ca99c5519c4300cc9dea +Author: John (J5) Palmieri +Date: 2005-10-06 04:43:52 +0000 + + * actualy add the introspection parser to CVS :-) + +A python/introspect_parser.py + +commit 423589e748db1783cbce03452e5fe5685b83f750 +Author: John (J5) Palmieri +Date: 2005-10-05 20:43:46 +0000 + + * glib/dbus-gvalue.c (marshal_variant): call _dbus_gvalue_marshal + instead of marshal basic so we can handle recursive types in a variant + + * test/glib/test-dbus-glib.c: Add test for marshaling recurive types + in variants + + * test/glib/test-service-glib.c, test-service-glib.xml + (my_object_echo_variant [EchoVariant], + my_object_process_variant_of_array_of_ints123 + [ProcessVariantOfArrayOfInts123]): + Add two test methods + + * python/introspect_parser.py: New module for parsing introspect + data. + + * python/dbus_bindings.pyx: + (various places): when throwing errors fix to use errormsg instead + of message local variable because Pyrex can get confused with other + message variables (initial patch by Robert McQueen + ) + (MessageIter::parse_signature_block): new method for getting + the next + block in a signiture. + (MessageIter::append_strict): new method for appending values + strictly + using the passed in signature instead of guessing at the type + (MessageItter:: append_dict, append_struct, append_array): use + signatures to marshal children if the signature is available + + * python/exceptions.py (IntrospectionParserException): new exception + + * python/proxies.py (ProxyMethod::__call__): Marshal args with + introspected signatures if available, else we fall back to the + old way of doing things. + (ProxyObject::_introspect_reply_handler ): parse introspection data + + * python/service.py (ObjectType::_reflect_on_method): Properly + terminate if there are no args in the reflection data + + * test/python/test-client.py: add tests for talking with the GLib + test server. This gives us better coverage for introspection since + python to python will always generate arguments as variants. + It also + allows us to test the robustness of the GLib bindings and + interlanguage + communications. + +M python/Makefile.am +M python/dbus_bindings.pyx +M python/exceptions.py +M python/proxies.py +M python/service.py + +commit 747ebb525b3522cab2415fe55c6a8418a7528238 +Author: John (J5) Palmieri +Date: 2005-09-26 22:12:17 +0000 + + * dbus/Python.pyx: Fixed memory leaks when throwing errors. We now + copy the message from a DBusError and then free the error object + befor throwing the error + +M python/dbus_bindings.pyx + +commit 583a8acad47cf49f9e28d8f7360f8bb1a409e0d4 +Author: John (J5) Palmieri +Date: 2005-09-06 22:42:54 +0000 + + - update to next release version + +M python/__init__.py + +commit 8f6b65becb2183f68e5c923854c4b5946a40dbfd +Author: John (J5) Palmieri +Date: 2005-09-06 22:38:54 +0000 + + * Released 0.50 + + * Patch from Steve Grubb: + - bus/activation.c (bus_activation_service_reload_test): clean up + some indentation + - dbus/dbus-keyring.c (_dbus_keyring_reload): fix conditional + - dbus/dbus-message-factory.c (generate_special): fix a couple of + buffer overflows in the test suite. This is non critical because + it can not be exploited and this code is only run when doing a + make check. + + * Patch from Yaakov Selkowitz: Build fixes for Cygwin + - configure.in: Don't check and link against kdecore, only qt headers + - dbus/Makefile.am: Add -no-undefined to libdbus_1_la_LDFLAGS + - gcj/org/freedesktop/dbus/Makefile.am: + add libdbus_gcj_1_la_LDFLAGS = -no-undefined + - glib/Makefile.am: Add -no-undefined to libdbus_glib_1_la_LDFLAGS + and $(DBUS_GLIB_LIBS) to dbus_binding_tool_LDADD + - qt/Makefile.am: Add -no-undefined to libdbus_qt_1_la_LDFLAGS + - tools/Makefile.am: Add platform extentions to binaries + (i.e. .exe on windows) + + * configure.in: + - Make it so if no suitable version of python is found we only + disable building python instead of exiting the configure script + - Require version 2.4 of glib for glib bindings + - Up version to 0.50 + + * python/__init__.py: Sync version with libdbus to (0,50,0) + +M python/__init__.py + +commit c9ce6ac673fef6ca5189480d73b542e7f2c283f3 +Author: John (J5) Palmieri +Date: 2005-09-01 01:22:06 +0000 + + * python/Makefile.am: Break on pyrexc errors instead of ignoring them + + * python/dbus_bindings.pyx: Memory management foo + (global): remove hacky _user_data_references global list + (GIL_safe_cunregister_function_handler): userdata now stuffed into + tuples. Unref user_data + (GIL_safe_cmessage_function_handler): userdata now stuffed into tuples + (Connection::__del__): Remove and replace with __dealloc__ method + (Connection::add_filter): Stuff user_data into a tuple. Use Py_INCREF + to keep tuple from being deallocated instead of the global var hack + (Connection::register_object_path): Stuff user_data into a tuple. + Use Py_INCREF to keep tuple from being deallocated instead of the + global var hack + (Connection::register_fallback): Stuff user_data into a tuple. + Use Py_INCREF to keep tuple from being deallocated instead of the + global var hack + (GIL_safe_pending_call_notification): Don't unref the message + because it gets unreffed when going out of scope. Py_XDECREF + the user_data + (PendingCall::__del__): Remove and replace with __dealloc__ method + (PendingCall::set_notify): ref the pending call because we will + need it to stick around for when the notify callback gets called + (Message::__del__): Remove and replace with __dealloc__ method + + * python/dbus_glib_bindings.pyx (init_gthreads): Changed to + gthreads_init to match up with the dbus call + + * python/glib.py (init_threads): Changed to threads_init to match + up with gobject.threads_init(). init_threads is kept for backwards + compat but will most likely be deprecated in the future + + * test/python/test-client.py: + - revamp to use Python's unittest functionality + - add async call tests + - setup threads in glib and dbus so we make sure locks are working + +M python/Makefile.am +M python/dbus_bindings.pyx +M python/dbus_glib_bindings.pyx +M python/glib.py + +commit c33b023b7a72b42129e202ad3a34d9ac6bc68090 +Author: John (J5) Palmieri +Date: 2005-08-31 02:18:43 +0000 + + * python/dbus_bindings.pyx + + (_pending_call_notification, cunregister_function_handler, + cmessage_function_handler): All callback functions have been + rearranged + to workaround a bug in Pyrex when working with the GIL which is + Python's + global lock when dealing with threads. They have been split into + a wrapper function (which assumes the name of the old function) and + a _GIL_safe_ function which contains the functionality + of the old function. This ensures that Pyrex does not write code + the lock is released. + +M python/dbus_bindings.pyx + +commit ccba1a75d274300215ac3b8eb06792c06679de55 +Author: John (J5) Palmieri +Date: 2005-08-30 15:21:04 +0000 + + * python/dbus_bindings.pyx (_pending_call_notification): Obtain the + GIL global lock when calling back into Python + +M python/dbus_bindings.pyx + +commit 780a08253b6e9ac0270d50cb0498cb7085bd05a2 +Author: John (J5) Palmieri +Date: 2005-08-26 04:23:33 +0000 + + * s/Message(_create=0)/EmptyMessage everywhere else + + * test/python/test-{server|client}.py: add the python/.libs directory + to the lookup path so dbus_bindings and dbus_glib_bindings don't + get picked up from the system + +M python/dbus_bindings.pyx + +commit 068820cbec569f14277f0dc52e4219ad123bed24 +Author: John (J5) Palmieri +Date: 2005-08-26 03:09:58 +0000 + + * python/dbus_bindings.pyx: Tracked down a major memleak and fixed + it (EmptyMessage): new class that subclasses Message. This is a + workaround to a Pyrex bug that fails to call __del__ when the Message + object goes out of scope. For some reason subclassing Message fixes + this bug (Bus::send_with_reply_and_block): use EmptyMessage instead + of Message + +M python/dbus_bindings.pyx +M python/proxies.py + +commit 749873c6f8326c450173f62078c8eb8f38e7e2f7 +Author: John (J5) Palmieri +Date: 2005-08-24 19:58:32 +0000 + + - Merged changed from the DBUS_0_36_1 bugfix branch + +M python/Makefile.am +M python/_dbus.py +M python/proxies.py + +commit c93ba0371f2bed41ceb47826dea8852b6b6107cf +Author: John (J5) Palmieri +Date: 2005-08-23 17:43:59 +0000 + + * python/dbus_glib_bindings.pyx: reorder imports and c definitions + + to fix some wranings. We now use dbus_bindings.DBusConnection instead + of defining DBusConnection ourselves. + +M python/dbus_glib_bindings.pyx + +commit 0caa747c4dac110d7a1550cfcded41c03d5bf4f7 +Author: John (J5) Palmieri +Date: 2005-08-18 20:57:28 +0000 + + * python/dbus.pth: New path file to fix up problems when installing + c libraries to lib64 and python files to lib. + + * python/Makefile.am: install dbus.pth in the correct spot + +M python/Makefile.am +A python/dbus.pth + +commit 53aee6867499fb4b2135ed06dd5c4c6cd96058e0 +Author: John (J5) Palmieri +Date: 2005-08-18 04:04:57 +0000 + + * ChangeLog: clean up my last entry a bit + + * doc/introspect.xsl: New stylesheet for converting introspection + data + into browser renderable xhtml. Contributed by Lennart Poettering. + + * doc/introspect.dtd: Fixups in the introspect format from Lennart + Poettering. + + * doc/dbus-tutorial.xml: + - Add Colin Walter to the Authors section for authoring the GLib + section + - Add descriptions of the new signature and type functionality + in the Python complex type mapping section + - Add a sidenote on the new args matching functionality in + the Python bindings + - Fixed up some of the examples to use the gobject.MainLoop + instead of gtk.main + + * python/_dbus.py: + (Bus::_create_args_dict): New. Converts a hash of arg matches + to a more useable format + (Bus::add_signal_receiver): add a **keywords parameter for + catching + arg match parameters + (Bus::remove_signal_receiver): add a **keywords parameter for + catching + arg match parameters + + * python/matchrules.py: + (MatchTree::exec_matches): Check for arg matches + (SignalMatchRule::add_args_match): New method + (SignalMatchRule::execute): Added args_list parameter as an + optimization + so we don't have to marshal the args more than once + (SignalMatchRule::match_args_from_list): New method that checks + to see + if the rule's arg matches match an argument list. Only arguments + set in the rule are checked. + (SignalMatchRule::match_args_from_rule): New method that checks + to see + if the rule's arg matches match another rule's. All args have + to match + in order for this method to return true. If either rule has + more args + then it is not a match. + (SignalMatchRule::is_match): Add args match + (SignalMatchRule::repr): Add args to the final output if they + exist + +M python/_dbus.py +M python/examples/example-signal-recipient.py +M python/matchrules.py + +commit 4f3ccf5fd76cacb67b1a73c7a88b00fe83180275 +Author: John (J5) Palmieri +Date: 2005-08-16 22:54:02 +0000 + + * python/__init__.py: Version updated (0, 43, 0) + + * python/dbus_bindings.pyx: + - Fixed type objects to have self passed into __init__ + - Added the Variant type + - Add the ability to specify types or signatures for Array, + Variant and Dictionary + - (Connection::send_with_reply_handlers): return a PendingCall + object + - (_pending_call_notification): handle the case when an error + is returned + without an error message in the body + - (MessageIter::get_boolean): return True or False instead of + an integer + - (MessageIter::python_value_to_dbus_sig): add direct checking + of types and + add checks for objects with embeded signatures or types (Array, + Variant and + Dictionary) + - (MessageIter::append_byte): handle case when the value is + a dbus.Byte + - (MessageIter::append_dict): handle embeded types or signatures + - (MessageIter::append_array): handle embeded types or signatures + - (MessageIter::append_variant): new method + + * python/proxies.py: + - (DeferedMethod): New. Dummy executable object used when queuing + calls blocking on + introspection data + - (ProxyMethod::__call__): add the timeout keyword for specifying + longer or + shorter timeouts for method calls + - (ProxyObject): Add first pass at an introspection state machine + - (ProxyObject::__init__): Add introspect keyword for turing + off an on + introspection. + - (ProxyObject::_Introspect): Internal Introspect call that + bypasses the usual + mechanisms for sending messages. This is to avoid a deadlock + where the Intospect + call would be queued waiting for the Introspect call to finish ;-) + - (ProxyObject::_introspect_reply_handler): New. This method + is called when + introspection returns with no error + - (ProxyObject::_introspect_error_handler): New. This method + is called when + introspection encounters an error + - (ProxyObject::__getattr__): Code to handle different + introspection states. + Queue async calls or block blocking calls if we are introspecting. + Pass through + as normal if we are not or are done with introspecting. + + * python/service.py: Import signal and method from decorators.py + + * python/types.py: Add Variant type + +M python/__init__.py +M python/_dbus.py +M python/dbus_bindings.pyx +M python/examples/example-client.py +M python/examples/list-system-services.py +M python/proxies.py +M python/service.py +M python/types.py + +commit 3ff048fc5ad215987749046e283ca97454bc7554 +Author: John (J5) Palmieri +Date: 2005-07-20 14:15:08 +0000 + + * python/_dbus.py, _util.py, decorators.py, extract.py, + matchrules.py. proxies.py, service.py: Cleanup of code after + running it through the pyflakes code checker mostly dealing + with undefined names. (Bug #3828, Patch from Anthony Baxter + ) + +M python/_dbus.py +M python/_util.py +M python/decorators.py +M python/extract.py +M python/matchrules.py +M python/proxies.py +M python/service.py + +commit a076f4405829b136edbb89d99fbc485c9179b642 +Author: John (J5) Palmieri +Date: 2005-07-17 21:02:56 +0000 + + * Merge DBUS_0_35_2 branch into HEAD + + 2005-07-17 John (J5) Palmieri + + * NEWS: Update to 0.35.2 + + 2005-07-17 John (J5) Palmieri + + * python/_dbus.py: Remove import of the dbus.services + module as it no longer exists (patch from Dimitur Kirov) + + * python/service.py (Object::__init__): Fixed typo + s/name/bus_name (patch from Dimitur Kirov) + + * python/examples/example-signal-emitter.py: import dbus.glib + to get the main loop and use glib mainloop instead of gtk so + X doesn't have to be running. + + * python/examples/example-signal-recipient.py: import + dbus.glib + to get the main loop and use glib mainloop instead of gtk so + X doesn't have to be running. Import the decorators module + directly. + + * test/glib/Makefile.am: Added DIST_EXTRA files that + distcheck + didn't pick up on but are needed to build + + * configure.in: upped version to 0.35.2 + + * bus/driver.c, bus/selinux.c, bus/selinux.h, + dbus/dbus-protocol.h: + added Colin Walters' SELinux API rename patch from head + s/unix sercurity context/selinux security context/ + + 2005-07-16 John (J5) Palmieri + + * python/Makefile.am: dbus_binding.pxd.in should be included + in EXTRA_DIST not dbus_binding.pxd + fix up $(srcdir) hopefully for the last time + + * NEWS: Update to 0.35.1 + +M python/Makefile.am +M python/_dbus.py +M python/examples/example-signal-emitter.py +M python/examples/example-signal-recipient.py +M python/service.py + +commit cf7d10b2e4240c5c2bd4df4a1f2cf5b76aa499c0 +Author: John (J5) Palmieri +Date: 2005-07-15 20:28:05 +0000 + + * glib/Makefile.am: Add make-dbus-glib-error-switch.sh to EXTRA_DIST + so distcheck doesn't fail + + * glib/examples/Makefile.am: Add example-service.xml and + example-signal-emitter.xml to EXTRA_DIST so distcheck doesn't fail + + * glib/examples/statemachine/Makefile.am: Add statemachine.xml and + statemachine-server.xml to EXTRA_DIST so distcheck doesn't fail + + * python/Makefile.am: Preprend $(srcdir)/ to source files so the + compiler looks in the right places during distcheck + +M python/Makefile.am + +commit dc94fa7e3cd71c0dd29b4899bb0d956dc4019b34 +Author: John (J5) Palmieri +Date: 2005-07-15 18:09:59 +0000 + + * python/examples/example-service.py, + python/examples/example-signal-emitter.py: Fixed up examples for + API changes + +M python/examples/example-service.py +M python/examples/example-signal-emitter.py + +commit 8b4ad749be5c97607ad2c0c3bcf1fc41c4877bf5 +Author: John (J5) Palmieri +Date: 2005-07-15 17:33:17 +0000 + + * python/__init__.py: Upped to version (0,42,0) because of the + API change + +M python/__init__.py + +commit 96a7dee3c739e4c5eb6b18cc093bec41bb42da35 +Author: John (J5) Palmieri +Date: 2005-07-15 15:21:43 +0000 + + * bus/dispatch.c, test/test-service.c: Add testcase for sending + messages to oneself (TODO item). + + * python/service.py (class Object): Swap ordering of bus_name + and object_path parameters to better support inheritance. + + * doc/dbus-tutorial.xml: change Python docs to reflect change + in parameter ordering and fix the inheritance section. + + * doc/TODO: remove sending message to oneself TODO item + +M python/service.py + +commit 557f47a57fed5a5b4e56677ed0cf5ae8f2987536 +Author: John (J5) Palmieri +Date: 2005-07-15 02:15:07 +0000 + + * python/_dbus.py (Bus::remove_signal_receiver): don't add a callback + to the match if none has been passed in + + * python/matchrules.py (SignalMatchTree::remove): if the rule + being matched does not have a callback treat it as a wildcard + fix matching logic + + * doc/dbus-tutorial.xml: Add Python tutorial + +M python/_dbus.py +M python/matchrules.py + +commit ea23dea1046cb6e9fdb2d618a53e61d1d61b1f53 +Author: John (J5) Palmieri +Date: 2005-07-14 20:44:15 +0000 + + Checking in Rodrigo's patch along with my fixes to the patch + + 2005-07-14 John (J5) Palmieri + + * bus/activation.c: clean up all tabs to be 8 spaces + (bus_activation_activate_service): make sure we clean up + if activation fails + + * bus/dispatch.c: clean up all tabs to be 8 spaces + (check_shell_fail_service_auto_start): New function + tests to make sure we get fail properly when trying to auto + start a service + with a faulty command line + (check_shell_service_success_auto_start): New function tests to + make sure + auto started services get the arguments on the command line + + * test/test-shell-service.c: Added service for testing + auto-starting with + command line arguments + + * test/data/valid-service-files/debug-shell-echo-fail.service.in, + test/data/valid-service-files/debug-shell-echo-success.service.in: + Added service files for testing auto-starting with command + line arguments + + * */.cvsignore: added a bunch of generated files to various + .cvsignore files + + 2005-07-14 Rodrigo Moya + + * dbus/dbus-shell.[ch]: copy/pasted code from GLib. + + * dbus/Makefile.am: added new files to build. + + * bus/activation.c (bus_activation_activate_service): support + activation commands with parameters. + + * test/shell-test.c: added test program for the shell parsing + code. + +M python/.cvsignore +M python/Makefile.am + +commit 008027f4fafbbb77a45c0fa586855552c9564696 +Author: John (J5) Palmieri +Date: 2005-07-13 18:22:34 +0000 + + * python/.cvsignore: remove dbus_bindings.pyx, add dbus_bindings.pxd + + * python/service.py (class Name): renamed BusName to make it clearer + what the object is for (a name on the bus) + + * python/examples/example-service.py, + python/examples/example-signal-emitter.py: change the Name object to + BusName + +M python/.cvsignore +M python/examples/example-service.py +M python/examples/example-signal-emitter.py +M python/service.py + +commit ac9ab9544b98222fcce9329194f10774edea8a87 +Author: John (J5) Palmieri +Date: 2005-07-12 18:16:05 +0000 + + * python/dbus_bindings.pyx.in: removed + + * python/dbus_bindings.pyx: Added. + - Fixed some memleaks (patch from + Sean Meiners ) + - Broke out the #include "dbus_h_wrapper.h" and put it in its + own pxd file (Pyrex definition) + - Broke out glib dependancies into its own pyx module + + * python/dbus_bindings.pdx: Added. + - Defines C class Connection for exporting to other modules + + * python/dbus_glib_bindings.pyx: Added. + - New module to handle lowlevel dbus-glib mainloop integration + + * python/glib.py: Added. + - Registers the glib mainloop when you import this module + + * python/services.py: Removed (renamed to service.py) + + * python/service.py: Added. + - (class Server): renamed Name + + * python/__init__.py: Bump ro version (0,41,0) + - don't import the decorators or service module + by default. These now reside in the dbus.service namespace + + * python/_dbus.py (Bus::__init__): Add code run the main loop + setup function on creation + + * python/examples/example-service.py, + python/examples/example-signal-emitter.py: update examples + + * python/examples/gconf-proxy-service.py, + python/examples/gconf-proxy-service2.py: TODO fix these up + + * doc/TODO: Addition + - Added a Python Bindings 1.0 section + - added "Add match on args or match on details to match rules" + +M python/Makefile.am +M python/__init__.py +M python/_dbus.py +A python/dbus_bindings.pxd.in +R098 python/dbus_bindings.pyx.in python/dbus_bindings.pyx +A python/dbus_glib_bindings.pyx +M python/examples/example-service.py +M python/examples/example-signal-emitter.py +M python/examples/gconf-proxy-service.py +M python/examples/gconf-proxy-service2.py +A python/glib.py +R096 python/services.py python/service.py + +commit 5f5b7847e7a159e040bc9070a143cd6547a9689b +Author: John (J5) Palmieri +Date: 2005-06-28 19:36:51 +0000 + + * python/dbus_bindings.pyx.in (cunregister_function_handler, + cmessage_function_handler): Patch from Anthony Baxter + fixes threading problems by using the + Py_GILState_Ensure/Release to synchronize with the python runtime. + +M python/dbus_bindings.pyx.in + +commit b9ef3eaf17a91f258af17c6e9ae8acb23eb7b411 +Author: Colin Walters +Date: 2005-06-16 05:51:46 +0000 + + 2005-06-16 Colin Walters + + * python/dbus_bindings.pyx.in: Import size_t, + __int64_t, __uint64_t, and __signed. + + * dbus/dbus-sysdeps.c (write_credentials_byte): + Define cmsg struct, output it. + (_dbus_read_credentials_unix_socket): + Use cmsg struct. + + Patch from Joe Markus Clarke for FreeBSD support. + +M python/dbus_bindings.pyx.in + +commit 4a8fc73472c80880c0c6c5cf1401f3ab9817965f +Author: Colin Walters +Date: 2005-06-13 03:01:17 +0000 + + 2005-06-12 Colin Walters + + Async signals and various bugfixes and testing by + Ross Burton . + + * glib/dbus-gvalue.h: (struct DBusBasicGValue): Delete. + (dbus_gvalue_genmarshal_name_from_type) + (dbus_gvalue_ctype_from_type): Moved to dbus-binding-tool-glib.c. + (dbus_gtype_to_dbus_type): Renamed to dbus_gtype_from_signature. + (dbus_g_value_types_init, dbus_gtype_from_signature) + (dbus_gtype_from_signature_iter, dbus_gtype_to_signature) + (dbus_gtypes_from_arg_signature): New function prototypes. + (dbus_gvalue_demarshal): Take context and error arguments. + (dbus_gvalue_demarshal_variant): New function. + (dbus_gvalue_demarshal_message): New function. + (dbus_gvalue_store): Delete. + + * glib/dbus-gvalue.c: + + File has been almost entirely rewritten; now we special-case + more types such as DBUS_TYPE_SIGNATURE, handle arrays and + hash tables correctly, etc. Full support for recursive values + is not yet complete. + + * glib/dbus-gproxy.c (dbus_g_proxy_class_init): Change last + argument of signal to G_TYPE_POINTER since we now pass a + structure. + (lookup_g_marshaller): Delete in favor of + _dbus_gobject_lookup_marshaller. + (marshal_dbus_message_to_g_marshaller): Use + _dbus_gobject_lookup_marshaller and dbus_gvalue_demarshal_message + to handle remote signal callbacks. + (dbus_g_proxy_new_from_proxy): New function; creates a new + DBusGProxy by copying an existing one. + (dbus_g_proxy_get_interface, dbus_g_proxy_set_interface) + (dbus_g_proxy_get_path): New functions. + (dbus_g_proxy_marshal_args_to_message): New function; + factored out of existing code. + (DBUS_G_VALUE_ARRAY_COLLECT_ALL): Collect all arguments + from a varargs array. + (dbus_g_proxy_begin_call_internal): New function. + (dbus_g_proxy_end_call_internal): New function. + (dbus_g_proxy_begin_call): Take GTypes instead of DBus types + as arguments; simply invoke dbus_g_proxy_begin_call_internal + after collecting args into value array. + (dbus_g_proxy_end_call): Take GTypes instead of DBus types; + invoke dbus_g_proxy_end_call_internal. + (dbus_g_proxy_invoke): Simply invoke begin_call_interanl and + end_call_internal. + (dbus_g_proxy_call_no_reply): Take GTypes instead of DBus + types. + (array_free_all): New function. + (dbus_g_proxy_add_signal): Take GTypes. + + * glib/dbus-gobject.h: + (_dbus_glib_marshal_dbus_message_to_gvalue_array): Delete. + (_dbus_gobject_get_path, _dbus_gobject_lookup_marshaller): + Prototype. + + * glib/dbus-gobject.c: Add a global marshal_table hash which + stores mappings from type signatures to marshallers. Change lots + of invocations of dbus_gtype_to_dbus_type to + dbus_gtype_to_signature. + (_dbus_glib_marshal_dbus_message_to_gvalue_array): Delete. + (introspect_signals): Fix test for query.return_type. + (set_object_property): Update invocation of dbus_gvalue_demarshal. + (invoke_object_method): Many changes. Handle asynchronous + invocations. Convert arguments with + dbus_gvalue_demarshal_message. Handle errors. Use + DBusSignatureIter instead of strlen on args. Handle all arguments + generically. Special-case variants. + (dbus_g_method_return, dbus_g_method_return_error): New function. + (DBusGSignalClosure): New structure, closes over signal + information. + (dbus_g_signal_closure_new): New function. + (dbus_g_signal_closure_finalize): New function. + (signal_emitter_marshaller): New function; is special marshaller + which emits signals on bus. + (export_signals): New function; introspects object signals and + connects to them. + (dbus_g_object_type_install_info): Take GType instead of + GObjectClass. + (dbus_g_connection_register_g_object): Invoke export_signals. + (dbus_g_connection_lookup_g_object): New function. + (DBusGFuncSignature) New structure; used for mapping type + signatures to marshallers. + (funcsig_hash): New function; hashes DBusGFuncSignature. + (funcsig_equal): New function; compares DBusGFuncSignature. + (_dbus_gobject_lookup_marshaller): New function. + (dbus_g_object_register_marshaller): New function; used to + register a marshaller at runtime for a particular signature. + + * glib/dbus-gmain.c (_dbus_gmain_test): Add various tests. + + * glib/dbus-binding-tool-glib.h: Add DBUS_GLIB_ANNOTATION_ASYNC + which notes a server method implementation should be + asynchronous. + + * glib/dbus-binding-tool-glib.c + (dbus_binding_tool_output_glib_server): Call + dbus_g_value_types_init. + (write_formal_parameters): Use dbus_gtype_from_signature. Handle + variants specially. + (dbus_g_type_get_lookup_function): Turn GType into an invocation + of a lookup function. + (write_args_for_direction): Use dbus_g_type_get_lookup_function. + (write_untyped_out_args): New method; write output arguments. + (write_formal_declarations_for_direction): Function for + writing prototypes. + (write_formal_parameters_for_direction): Function for + writing implementations. + (write_typed_args_for_direction): Function for writing + arguments prefixed with GTypes. + (write_async_method_client): Write out async version + of method. + + * glib/dbus-binding-tool-glib.c: Include dbus-gvalue-utils.h. + (dbus_g_type_get_marshal_name): Move mapping from GType + to marshal name into here. + (dbus_g_type_get_c_name): Move into here. + (compute_marshaller): Convert signature to type with + dbus_gtype_from_signature, use dbus_g_type_get_marshal_name. + (compute_marshaller_name): Ditto. + (compute_marshaller): Handle async signal annotations. + (gather_marshallers): Return if we don't have a known + prefix. + (generate_glue): Collect introspection blob here, and + write all of the blob at the end. This allows an object + with multiple interfaces to work. + Mark async methods in introspection blob. + + * glib/Makefile.am (libdbus_glib_1_la_SOURCES): Add + dbus-gtype-specialized.c, dbus-gtype-specialized.h, + dbus-gvalue-utils.h, dbus-gvalue-utils.c. + + * dbus/dbus-glib.h: Don't include dbus-protocol.h; this + avoids people accidentally using DBUS_TYPE_* which should + not be necessary anymore. + Do include dbus-gtype-specialized.h, which are utilities + for GLib container types. + Add various #defines for types such as + DBUS_TYPE_G_BOOLEAN_ARRAY. + (DBusGValueIterator, DBusGValue): Define, not fully used + yet. + (dbus_g_value_get_g_type): Type for recursive value. + (dbus_g_value_open, dbus_g_value_iterator_get_value) + (dbus_g_value_iterator_get_values, dbus_g_value_iterator_recurse) + (dbus_g_value_free): Prototypes. + (dbus_g_object_register_marshaller, dbus_g_proxy_new_from_proxy): + Prototype. + (dbus_g_proxy_set_interface): Prototype. + (dbus_g_proxy_begin_call, dbus_g_proxy_end_call) + (dbus_g_proxy_call_no_reply): Take GLib types instead of DBus + types. + (dbus_g_proxy_get_path, dbus_g_proxy_get_interface): + Accessors. + (DBusGAsyncData, DBusGMethodInvocation): Structures for + doing async invocations. + (dbus_g_method_return, dbus_g_method_return_error): + Prototypes. + * doc/dbus-tutorial.xml: Update GLib section. + + * tools/dbus-viewer.c (load_child_nodes): Update + for new invocation type of dbus_g_proxy_end_call. + (load_from_service_thread_func): Ditto. + + * tools/print-introspect.c (main): Ditto. + + * tools/dbus-names-model.c (have_names_notify) + (names_model_reload, names_model_set_connection) + Use GTypes. + + * python/Makefile.am (INCLUDES): Define DBUS_COMPILATION, + needed since Python bindings use GLib bindings. + + * test/glib/Makefile.am (INCLUDES): Define DBUS_COMPILATION. + Add --prefix argument. + + * tools/Makefile.am: Define DBUS_COMPILATION. Remove + unneeded --ignore-unsupported arg. + + * test/glib/test-service-glib.c: + * test/glib/test-service-glib.xml: + * test/glib/test-dbus-glib.c: Add many more tests. + +M python/Makefile.am + +commit fc5d7298d72e20bfc3e209e44e6791643a838f49 +Author: John (J5) Palmieri +Date: 2005-05-24 16:34:38 +0000 + + * python/__init__.py: Python bindings deserve a minor version + update. Upped to (0, 40, 2) + +M python/__init__.py + +commit abd0204928614dc1d36125e9d3634c25e068af59 +Author: John (J5) Palmieri +Date: 2005-05-24 16:30:50 +0000 + + * python/decorators.py: add explicitly_pass_message decorator for + passing in the dbus message as keyword for edge case signal handling + + * python/matchrules.py (SignalMatchRule.__repr__): fix output + to conform with what dbus expects for match rules + (SignalMatchRule.execute): add the dbus message as a keyword + if the signal handler has requested it + + * python/examples/example/signal-recipient.py: added some more + examples on how to hook up to signals + + * python/proxies.py: minor formatting changes + +M python/_dbus.py +M python/decorators.py +M python/examples/example-signal-recipient.py +M python/matchrules.py + +commit 1db6dbecffec574f6773286416f7e92ccd864068 +Author: John (J5) Palmieri +Date: 2005-05-24 00:21:07 +0000 + + * python/decorators.py: import dbus_bindings + + * python/matchrules.py (SignalMatchRule, SignalMatchTree, + SignalMatchNode): new classes that implement wildcard signal + callback matching using a tree lookup. Heavily modified from a + patch sent by Celso Pinto (fd.o bug #3241) + + * _dbus.py (add_signal_receiver, remove_signal_receiver, + _signal_func): + use new match classes to handle signals. + +M python/Makefile.am +M python/_dbus.py +M python/decorators.py +M python/examples/example-signal-emitter.py +M python/examples/example-signal-recipient.py +A python/matchrules.py + +commit 717c3781328d631a16a74a8f51a7bb04d92729f6 +Author: John (J5) Palmieri +Date: 2005-05-19 20:27:19 +0000 + + - s/TYPE_PATH/TYPE_OBJECT_PATH + +M python/dbus_bindings.pyx.in + +commit 3979e97cf4245f720aed1764009a5d1fa875f595 +Author: John (J5) Palmieri +Date: 2005-05-16 21:27:03 +0000 + + * glib/dbus-gmain.c (io_handler_dispatch): fix deadlock when using + recursive g_main_loops + + * python/_dbus.py (class Bus): add the ProxyObjectClass + alias for ProxyObject to make it easier for the Twisted + networking framework to integrate dbus. + + * python/proxies.py (class ProxyObject): add the ProxyMethodClass + alias for ProxyMethod to make it easier for the Twisted + networking framework to integrate dbus. + +M python/_dbus.py +M python/proxies.py + +commit 0c2e7112539a1314393826dbd2a14c3c1239078a +Author: John (J5) Palmieri +Date: 2005-05-05 18:27:34 +0000 + + * Fix my name in previous changelog ;) + + * python/proxies.py (ProxyObject.__getattr__): add further patch + from Anthony Baxter to throw an AttributeError when python + __special__ functions are called instead of marshling them over + the bus (Bug#1685 comment 3). + +M python/proxies.py + +commit 933695891ea748308d76faaab23bc548c585b7b8 +Author: John (J5) Palmieri +Date: 2005-05-05 18:01:45 +0000 + + * python/Makefile.am: changed to use pyexecdir for the binding shared + libraries (Bug#2494) + + * python/exceptions.py: bring exceptions over from the bindings + so they can be used in applications (Bug#2036) + Make all exceptions derive from DBusException + + * python/_dbus.py, python/proxies.py: implement __repr__ in a couple + of classes so that print obj doesn't throw an exception (Bug #1685) + +M python/Makefile.am +M python/_dbus.py +M python/exceptions.py +M python/proxies.py + +commit 99e291c0cf9af2f4438def9212ce2f29c057ae7f +Author: John (J5) Palmieri +Date: 2005-05-01 19:34:58 +0000 + + * python/dbus_bindings.pyx.in: + + - added new type classes for hinting to the marashaler what type + to send over the wire + - added int16 and uint16 marshalers + - Fixed a bug in the type constants that caused int32 to go out + as uint16 over the wire + * python/dbus.py: split up into different files and renamed _dbus.py + * python/__init__.py, python/_util.py, python/decorators.py, + python/exceptions.py, python/proxies.py, python/services.py, + python/types.py: new files split off from dbus.py + * python/Makefile.am: Add new files, remove dbus.py and + install all python files to /dbus + * python/examples/*: Added #!/usr/bin/env python to the top of + every example. Patch provided by Tatavarty Kalyan + +M python/Makefile.am +A python/__init__.py +A python/_dbus.py +A python/_util.py +D python/dbus.py +M python/dbus_bindings.pyx.in +A python/decorators.py +M python/examples/example-service.py +M python/examples/example-signal-emitter.py +M python/examples/example-signal-recipient.py +M python/examples/gconf-proxy-client.py +M python/examples/gconf-proxy-service.py +M python/examples/gconf-proxy-service2.py +M python/examples/list-system-services.py +A python/exceptions.py +A python/proxies.py +A python/services.py +A python/types.py + +commit b27b13812644b7da6a40c212437d1d6898aa9439 +Author: John (J5) Palmieri +Date: 2005-04-25 22:54:28 +0000 + + * python/dbus_bindings.pyx.in (send_with_reply_handlers): New send + + method for doing async calls + (_pending_call_notification): New C function for handling pendning + call + callbacks + (set_notify): New method for setting pending call notification + + * python/dbus.py: new version tuple "version" is set at (0, 40, 0) + Async capabilities added to remote method calls + (Sender): class removed + (RemoteService): class removed + (ObjectTree): class removed for now + (RemoteObject): Renamed to ProxyObject + (RemoteMethod): Renamed to ProxyMethod + (method): Decorator added for decorating python methods as dbus + methods + (signal): Decorator added for decorating python methods as signal + emitters + (ObjectType): Metaclass added for generating introspection data + and the + method callback vtable + (Interface): Wrapper class added to wrap objects in a dbus interface + (Object): Uses ObjectType as its metaclass and exports Introspect + of the org.freedesktop.DBus.Introspectable interface + (ValidationException, UnknownMethodException): new exceptions + + * python/examples/*: Modified to fit with the new bindings + +M python/dbus.py +M python/dbus_bindings.pyx.in +M python/examples/example-client.py +M python/examples/example-service.py +M python/examples/example-signal-emitter.py +M python/examples/example-signal-recipient.py +M python/examples/list-system-services.py + +commit b190b899f2f645d4b71d01eb9f53ce0e198ce576 +Author: John (J5) Palmieri +Date: 2005-03-29 17:01:43 +0000 + + * python/lvalue_cast_post_process.py - removed. Patch has been + submitted to Pyrex maintainers that fixes gcc4.0 error + + * python/Makefile.am: removed refrences to lvalue_cast_post_process.py + +M python/Makefile.am +D python/lvalue_cast_post_process.py + +commit a4597b45df11db105206b87054042f9612684b2e +Author: John (J5) Palmieri +Date: 2005-03-21 21:13:56 +0000 + + * python/lvalue_cast_post_process.py - added post processor to fix + Pyrex code so that it compiles with gcc4.0 + + * python/Makefile.am: Added lvalue_cast_post_process.py to EXTRA_DIST + run dbus_bindings.c through lvalue_cast_post_process.py and copy the + results back to dbus_binding.c + +M python/Makefile.am +A python/lvalue_cast_post_process.py + +commit bb519aab3c2b9112eba2e67a50e2864dc65f765c +Author: John (J5) Palmieri +Date: 2005-02-23 19:36:24 +0000 + + python/dbus_bindings.pyx.in (PendingCall::get_reply): + + s/dbus_pending_call_get_reply/dbus_pending_call_steal_reply + +M python/dbus_bindings.pyx.in + +commit 4940b112efc417868f567d885e36297e14e43244 +Author: John (J5) Palmieri +Date: 2005-02-11 19:51:18 +0000 + + * python/dbus.py (class Sender): added to support dbus signals better + + to True. When expand args is True the signal handler will pass the + message arguments as parameters to the signal handler. If False + revert to previous behavior where the signal handler must get the + argument list from the message. This is to help port applications + like HAL that have a tendancy to send variable length argument lists. + self._match_rule_to_receivers is now a dict of dicts. + (Bus::remove_signal_receiver): pop handler off the dict intead of + removing it from a list + (Bus::_signal_func): change signal handlers so that interface, + signal_name, service, path and message are packed into a Sender + object and that is passed to the handler. If expand_args is True + extract the args list from the message and append it to the parameter + list + + * python/dbus_bindings.pyx.in (class Signature): added to support + signiature types + (MessageIter::__init__): changed iteration limit to match D-BUS + (MessageIter::get*): added INT16, UINT16, SIGNATURE, DICT_ENTRY, + STRUCT and VARIENT type support + (MessageIter::python_value_to_dbus_sig): made recursive to support + recursive types + (MessageIter::append*): added Signature, dict, tuple + support + + * python/examples/example-client.py: added examples of getting tuples + and dicts + + * python/examples/example-service.py: added examples of sending tuples + and dicts + + * python/examples/example-signal-recipient.py: Fixed to handle new + signal callback format + +M python/dbus.py +M python/dbus_bindings.pyx.in +M python/examples/example-client.py +M python/examples/example-service.py +M python/examples/example-signal-recipient.py + +commit ca4b771f58b30005ec4bb47acacfa73d1c467ac9 +Author: John (J5) Palmieri +Date: 2005-01-28 19:09:54 +0000 + + * python/dbus_bindings.pyx.in: Updated to handle new D-BUS type + system - BUS_ACTIVATION -> BUS_STARTER - DBUS_BUS_ACTIVATION -> + DBUS_BUS_STARTER - class MessageIter (__init__): Added recursion + checking so we throw a nice error instead of just disconnecting from + the bus. (get): Added arg_type parameter for recursion. Removed + the nil type Added signiture type placeholder (not implemented) + Added struct type placeholder (not implemented) Added varient + type placeholder (not implemented) Commented out dict type for + now (get_element_type): renamed from get_array_type (get_*): + changed to use the dbus_message_iter_get_basic API (get_*_array): + removed in favor of recursive get_array method (get_array): new + recursive method which calls get to marshal the elements of the + array (value_to_dbus_sig): New method returns the corrasponding dbus + signiture to a python value (append): Comment out dict handling for + now Handle lists with the new recursive API Comment out None handling + for no + + w + (append_nil): removed + (append_*): changed to use dbus_message_iter_append_basic API + (append_*_array): removed in favor of recursive append_array + method + (__str__): Make it easier to print out recursive iterators + for debugging + - class Message (__str__): moved type inspection to the + MessageIter class' __str__ method + (get_iter): Added an append parameter wich defaults to False + If True use the new API's to create an append iterator + + * python/dbus.py: Update to use new bindings API + - TYPE_ACTIVATION -> TYPE_STARTER + - class Bus (_get_match_rule): GetServiceOwner -> GetNameOwner + - class ActivationBus -> class StarterBus + - class RemoteObject (__call__): get an append iterator + - (_dispatch_dbus_method_call): get an append iterator + - class Object (emit_signal): get an append iterator + + * python/examples/: Fixed up the examples to work with the new API + +M python/dbus.py +M python/dbus_bindings.pyx.in +M python/examples/example-service.py +M python/examples/example-signal-emitter.py +M python/examples/list-system-services.py + +commit f6f84489cf9e6fa2f343eb5ce4f78b9b2ee4dc90 +Author: John (J5) Palmieri +Date: 2005-01-25 19:06:53 +0000 + + * python/dbus_bindings.pyx.in: Rename of methods + and bindings - get_base_service->get_unique_name - + bus_get_base_service->bus_get_unique_name - dbus_bus_get_base_service + -> dbus_bus_get_unique_name - ACTIVATION_REPLY_ACTIVATED -> + DBUS_START_REPLY_SUCCESS - ACTIVATION_REPLY_ALREADY_ACTIVE + -> DBUS_START_REPLY_ALREADY_RUNNING - bus_activate_service + -> bus_start_service_by_name - dbus_bus_activate_service + -> dbus_bus_start_service_by_name - bus_acquire_service -> + bus_request_name - dbus_bus_acquire_service -> dbus_bus_request_name + - bus_service_exists -> bus_name_has_owner - dbus_bus_service_exists + -> dbus_bus_name_has_owner + + * python/dbus.py: Rename of methods + - activate_service -> start_service_by_name + - bus_acquire_service -> bus_request_name + - ACTIVATION_REPLY_ACTIVATED -> START_REPLY_SUCCESS + - ACTIVATION_REPLY_ALREADY_ACTIVE -> START_REPLY_ALREADY_RUNNING + +M python/dbus.py +M python/dbus_bindings.pyx.in + +commit dc9a91e745f5885fc9b63568a9f4228a7522c381 +Author: John (J5) Palmieri +Date: 2004-12-30 18:28:03 +0000 + + 2004-12-30 John (J5) Palmieri + + * python/dbus.py: + s/ACTIVATION_REPLY_ACTIVE/ACTIVATION_REPLY_ACTIVATED + +M python/dbus.py + +commit 32e2f57ac99f528d159b68b8dfafc74c39a3c4cc +Author: John (J5) Palmieri +Date: 2004-12-30 14:19:53 +0000 + + 2004-12-30 John (J5) Palmieri + + * python/dbus_bindings.pyx.in: Change + DBUS_ACTIVATION_REPLY_ACTIVATED + and DBUS_ACTIVATION_REPLY_ALREADY_ACTIVE to match the + values in + dbus-protocol.h. Because they are defines and not enums + they are not + autogenerated. + +M python/dbus_bindings.pyx.in + +commit 01740aa1f3c4c2cecdf37a3c043a42d0dbffc773 +Author: John (J5) Palmieri +Date: 2004-12-27 16:01:13 +0000 + + 2004-12-26 John (J5) Palmieri + + * python/dbus_bindings.pyx.in (bus_activate_service): Bind + dbus_bus_activate_service + + * python/dbus.py (Bus.activate_service): activate a service on the + bus. + +M python/dbus.py +M python/dbus_bindings.pyx.in + +commit f33050956dca770af4d188768bcd8537a1686d45 +Author: John (J5) Palmieri +Date: 2004-12-23 00:50:37 +0000 + + * patch from Rob Taylor - wrap + bus_get_unix_user method in low level bindings - add get_unix_user + method to the Bus class - fix extract.py so it can handle unsigned + long return types + +M python/dbus.py +M python/dbus_bindings.pyx.in +M python/extract.py + +commit 1a6d664b037ea2fcbcbfdc8d637a7f5309e68ffb +Author: David Zeuthen +Date: 2004-09-16 19:56:26 +0000 + + 2004-09-16 David Zeuthen + + * python/dbus_bindings.pyx.in: Add support for int64 and uint64 + +M python/dbus_bindings.pyx.in + +commit 6e5b6a98a792653e9248767be746a031e851cb84 +Author: Anders Carlsson +Date: 2004-07-28 18:14:55 +0000 + + 2004-07-28 Anders Carlsson + + * python/dbus.py: + * python/dbus_bindings.pyx.in: + Add dbus.init_gthreads (), allow emit_signal to pass + arguments to the signal. + +M python/dbus.py +M python/dbus_bindings.pyx.in + +commit bac1c708b7ae971bf96500161f56edec4120ad3b +Author: Seth Nickell +Date: 2004-07-18 21:44:37 +0000 + + 2004-07-18 Seth Nickell + + * python/dbus.py: + * python/dbus_bindings.pyx.in: + * python/tests/test-client.py: + + Add dbus.ByteArray and dbus_bindings.ByteArray + types so that byte streams can be passed back. + + Give jdahlin the heaps of credit that are so + rightfully his. + +M python/dbus.py +M python/dbus_bindings.pyx.in +M python/tests/test-client.py + +commit fb762d8e21ae66ceda54496168d92d7e8dc4bce2 +Author: Seth Nickell +Date: 2004-07-12 06:28:59 +0000 + + 2004-07-12 Seth Nickell + + * python/dbus.py: + + Add message argument to the default object_method_handler + function. + + * python/dbus_bindings.pyx.in: + + Automatically return NIL when passed an empty list + (we can't pass back a list since lists are typed + and we don't have any idea what type the the client + intended the list to be... :-( ) + +M python/dbus.py +M python/dbus_bindings.pyx.in + +commit 1e926c3330e91895034c91c59c368d7201a8bc56 +Author: Seth Nickell +Date: 2004-07-11 03:09:03 +0000 + + 2004-07-10 Seth Nickell + + * python/examples/Makefile.am: + + Fix distcheck breakage caused by new examples. + +M python/examples/Makefile.am + +commit e386459734ff05d09c43d50b8623659512d36975 +Author: Seth Nickell +Date: 2004-07-11 03:02:14 +0000 + + 2004-07-10 Seth Nickell + + * python/dbus.py: + + Add "message" argument to service-side dbus.Object + methods. This will break existing services written + using the python bindings, but will allow extraction + of all the message information (e.g. who its from). + + Add improved "object oriented" signal handling/emission. + + * python/examples/example-service.py: + + Nix this example. + + * python/examples/example-signal-emitter.py: + * python/examples/example-signal-recipient.py: + + Two new examples that show how to emit and receive + signals using the new APIs. + + * python/examples/example-signals.py: + * python/examples/gconf-proxy-service.py: + * python/examples/gconf-proxy-service2.py: + + Add "message" argument to service methods. + +M python/dbus.py +M python/examples/example-service.py +A python/examples/example-signal-emitter.py +A python/examples/example-signal-recipient.py +D python/examples/example-signals.py +M python/examples/gconf-proxy-service.py +M python/examples/gconf-proxy-service2.py + +commit 740b3a75006d1f5cc228c65838105a7a8b3ae75c +Author: John (J5) Palmieri +Date: 2004-06-23 14:59:43 +0000 + + * switched include directory from glib/ to dbus/ since dbus-glib.h + moved + +M python/Makefile.am + +commit 3ba6699d5e975a50693807268923bda69a15773a +Author: Owen Fraser-Green +Date: 2004-06-10 12:13:39 +0000 + + Fixed typo for python/examples make + +M python/examples/Makefile.am + +commit 5e41974dd9ea8db84985ff5b31d3ea525fbf0947 +Author: John (J5) Palmieri +Date: 2004-06-08 02:35:43 +0000 + + * Python bindings are updated to reflect C API changes which now + accept plain path strings instead of an array of path elements. + +M python/dbus_bindings.pyx.in + +commit e29bd0928368c6303209b6a2a4ea1ed749f6e58f +Author: Seth Nickell +Date: 2004-06-01 06:16:13 +0000 + + Update .cvsignore files + +M python/.cvsignore +C077 python/.cvsignore python/examples/.cvsignore + +commit 22ac6379fbc251ac40e1635353e2b83676f6ea66 +Author: Seth Nickell +Date: 2004-06-01 06:13:31 +0000 + + 2004-06-01 Seth Nickell + + * python/dbus_bindings.pyx.in: + * python/tests/test-client.py: + + Round off basic type support. Add dicts (yay!), and + remaining array types. + + Make MessageIter more general so it works for dicts too. + + Mark all loop variables as C integers. + +M python/dbus_bindings.pyx.in +M python/tests/test-client.py + +commit dd476a9662e4f66f08610a793458b4740823a525 +Author: Seth Nickell +Date: 2004-06-01 01:20:59 +0000 + + * python/dbus_bindings.pyx.in: * python/tests/test-client.py: + + Test Suite: 1 + Python Bindings: 0 + + (fix string array memory trashing bug... oops) + +M python/dbus_bindings.pyx.in +M python/tests/test-client.py + +commit 897be0d7a55449df0fb97b1126afecbb6906c083 +Author: Seth Nickell +Date: 2004-05-30 08:20:58 +0000 + + 2004-05-30 Seth Nickell + + * python/dbus.py: + + Add a nicer-but-less-flexible alternate API for handling + calls to virtual objects in dbus.ObjectTree. + + Screw up the argument order to the dbus.Object constructor + for consistency with dbus.ObjectTree (and to make dbus_methods + optional for future extension) + + * python/examples/Makefile.am: + * python/examples/gconf-proxy-service.py: + * python/examples/gconf-proxy-service2.py: + + Alternate implementation of gconf-proxy-service using the + nicer dbus.ObjectTree API. + + * python/examples/example-service.py: + * python/tests/test-server.py + + Reverse the argument order to deal with dbus.Object constructor + changes. + +M python/dbus.py +M python/examples/Makefile.am +M python/examples/example-service.py +M python/examples/gconf-proxy-service.py +C065 python/examples/gconf-proxy-service.py +python/examples/gconf-proxy-service2.py +M python/tests/test-server.py + +commit 51c8a42abcc0a2ab8e079d218003d9ccc48f1d79 +Author: Seth Nickell +Date: 2004-05-30 06:26:24 +0000 + + 2004-05-30 Seth Nickell + + * python/examples/example-client.py: + * python/examples/example-service.py: + + Take it back. Lists seem to work but they're broken + in the test suite. Make the base examples use + lists (works fine). + +M python/examples/example-client.py +M python/examples/example-service.py + +commit 4f3d0dac99f3f93fc04b403f8c7e6b2177725851 +Author: Seth Nickell +Date: 2004-05-30 06:21:00 +0000 + + 2004-05-30 Seth Nickell + + * python/dbus_bindings.pyx.in: + * python/tests/test-client.py: + + Add some more tests and fix errors that crop up. + Unfortunately, currently it seems like marshalling + and unmarshalling of lists is completely broken :-( + +M python/dbus_bindings.pyx.in +M python/tests/test-client.py + +commit 92e6c358afffd4fcdd5efd0075f9faa857c60ab3 +Author: Seth Nickell +Date: 2004-05-30 05:30:09 +0000 + + 2004-05-30 Seth Nickell + + * python/dbus_bindings.pyx.in: + + Add support for ObjectPath type. + + * python/dbus.py: + + Refactor message handling code to a common function. + + * python/tests/test-client.py: + * python/tests/test-server.py: + + Add tests that check to make sure values of all types + can be echoed from a service w/o mangling. + +M python/dbus.py +M python/dbus_bindings.pyx.in +A python/tests/test-client.py +A python/tests/test-server.py + +commit 4a5617e6090ca2402a74a0bf3cac2b891cbc0824 +Author: Seth Nickell +Date: 2004-05-30 02:26:48 +0000 + + 2004-05-29 Seth Nickell + + * python/dbus.py: + + Add ObjectTree class which allows implementation + of trees of "virtual" objects. Basically the python + wrapper for "register_fallback". + + * python/examples/Makefile.am + * python/examples/gconf-proxy-client.py: + * python/examples/gconf-proxy-service.py: + + Implement a simple GConf proxy service that supports + get/set on string and int GConf keys using the ObjectTree. + +M python/dbus.py +M python/examples/Makefile.am +A python/examples/gconf-proxy-client.py +A python/examples/gconf-proxy-service.py + +commit 188e82d59c07729efbefe22d0919150054d8b374 +Author: Seth Nickell +Date: 2004-05-29 22:37:13 +0000 + + 2004-05-29 Seth Nickell + + * python/dbus.py: + * python/examples/example-client.py: + * python/examples/example-service.py: + * python/examples/list-system-services.py: + + Add SessionBus, SystemBus and ActivationBus classes + so you don't need to know the special little BUS_TYPE + flag. + +M python/dbus.py +M python/examples/example-client.py +M python/examples/example-service.py +M python/examples/list-system-services.py + +commit 33e96395a41362c57790e3cc9313851ebdd04d96 +Author: Seth Nickell +Date: 2004-05-28 18:43:55 +0000 + + * python/examples/Makefile.am: + + Forget to add Makefile.am. Do not pass go. + +A python/examples/Makefile.am + +commit ab5a89c0348c8bd271015bfdb2a32f7d4cdf586c +Author: Seth Nickell +Date: 2004-05-28 02:52:23 +0000 + + * configure.in: * python/Makefile.am: + + Include the example python apps in the tarball. + + * python/examples/list-system-services.py + + Add a python new example that fetches the list of services + from the system bus. + +M python/Makefile.am +A python/examples/list-system-services.py + +commit eff8859282d14b81b24f6092a6e155b5a0df8183 +Author: Seth Nickell +Date: 2004-05-28 02:16:11 +0000 + + 2004-05-27 Seth Nickell + + * python/dbus.py: + * python/dbus_bindings.pyx.in: + + Fix failure to notify that a signal was not handled, + resulted in hung functions. + +M python/dbus.py +M python/dbus_bindings.pyx.in + +commit 42f81c81ba6e69ef0ae0b4c30f9708a7afb6c1e3 +Author: John (J5) Palmieri +Date: 2004-05-10 18:16:29 +0000 + + * Fixed python bindings by defining all need parameter and variable + types + +M python/dbus_bindings.pyx.in + +commit 7b93322959ed78fc28deda8c84835dfe2531a59d +Author: Michael Meeks +Date: 2004-03-29 12:50:45 +0000 + + hush. + +A python/.cvsignore + +commit 4f3a79f0e6ba96167dd92c730f122be5c7999889 +Author: Havoc Pennington +Date: 2004-03-19 22:36:30 +0000 + + 2004-03-19 Havoc Pennington + + * NEWS: 0.21 updates + + * configure.in: 0.21 + + * doc/Makefile.am: add all XMLTO usage to DBUS_XML_DOCS_ENABLED + + * python/Makefile.am: change to avoid dist of dbus_bindings.c so + you don't need pyrex to make dist + + * qt/Makefile.am (libdbus_qt_1_la_SOURCES): add integrator.h to + sources; run moc + +M python/Makefile.am + +commit e150be4e0a9e55b16eac520bdb5bd0c96621ea5a +Author: David Zeuthen +Date: 2003-12-01 20:49:53 +0000 + + 2003-12-01 David Zeuthen + + * python/dbus.py: Add the actual message when calling the reciever + of a signal such that parameters can be inspected. Add the method + remove_signal_receiver + +M python/dbus.py + +commit 5dd7e406571391570edc02ed1e0998cdad9f8493 +Author: David Zeuthen +Date: 2003-10-29 00:06:07 +0000 + + 2003-10-28 David Zeuthen + + * python/dbus_bindings.pyx.in: add get_dict to handle + dictionaries + return types. Fixup TYPE_* to reflect changes in + dbus/dbus-protocol.h + +M python/dbus_bindings.pyx.in + +commit 8a404b1ab5ed430112d35a23e6155c06a72f236f +Author: David Zeuthen +Date: 2003-10-15 21:25:13 +0000 + + 2003-10-14 David Zeuthen + + * python/dbus_bindings.pyx.in (MessageIter.get): fixed typo in + argtype to arg_type when raising unknown arg type exception. + Changed type list to reflect the changes in dbus-protocol.h so + the bindings actually work. + +M python/dbus_bindings.pyx.in + +commit c4a01481d5ec9530af0f1e08130420f099ffc96c +Author: Seth Nickell +Date: 2003-10-15 11:56:12 +0000 + + Fix makefile.am + +M python/Makefile.am + +commit 2a5101364f1b42e52dff3967e999419cfe266f8f +Author: Seth Nickell +Date: 2003-10-13 23:07:34 +0000 + + 2003-10-13 Seth Nickell + + * python/Makefile.am: + + Pass "make distcheck": remove a couple files from DIST_FILES + that weren't included in the final version. + +M python/Makefile.am + +commit 362dd3f1415326f9dd545e0ac6dc11ffc9507409 +Author: Havoc Pennington +Date: 2003-09-30 02:41:13 +0000 + + add examples + +A python/examples/example-client.py +A python/examples/example-service.py +A python/examples/example-signals.py + +commit 8253b8df29181efd8d6ddd84098384d27a403698 +Author: Havoc Pennington +Date: 2003-09-30 02:40:49 +0000 + + forgot to add files... + +A python/Makefile.am +A python/dbus.py +A python/dbus_bindings.pyx.in +A python/dbus_h_wrapper.h +A python/extract.py + +commit bdadc55cae07f4034bf64604398b382951098ada +Author: John (J5) Palmieri +Date: 2006-06-28 08:13:11 -0400 + + Initial commit of module dbus-python + +A ChangeLog diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..2099840 --- /dev/null +++ b/INSTALL @@ -0,0 +1,370 @@ +Installation Instructions +************************* + +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..c4a103f --- /dev/null +++ b/MANIFEST @@ -0,0 +1,132 @@ +.travis.yml +.version +AUTHORS +COPYING +ChangeLog +INSTALL +MANIFEST +MANIFEST.in +Makefile.am +Makefile.in +NEWS +README +_dbus_bindings/abstract.c +_dbus_bindings/bus.c +_dbus_bindings/bytes.c +_dbus_bindings/compat-internal.h +_dbus_bindings/conn-internal.h +_dbus_bindings/conn-methods.c +_dbus_bindings/conn.c +_dbus_bindings/containers.c +_dbus_bindings/dbus_bindings-internal.h +_dbus_bindings/debug.c +_dbus_bindings/exceptions.c +_dbus_bindings/float.c +_dbus_bindings/generic.c +_dbus_bindings/int.c +_dbus_bindings/libdbusconn.c +_dbus_bindings/mainloop.c +_dbus_bindings/message-append.c +_dbus_bindings/message-get-args.c +_dbus_bindings/message-internal.h +_dbus_bindings/message.c +_dbus_bindings/module.c +_dbus_bindings/pending-call.c +_dbus_bindings/server.c +_dbus_bindings/signature.c +_dbus_bindings/string.c +_dbus_bindings/types-internal.h +_dbus_bindings/unixfd.c +_dbus_bindings/validation.c +_dbus_glib_bindings/module.c +aclocal.m4 +build-aux/compile +build-aux/config.guess +build-aux/config.sub +build-aux/depcomp +build-aux/install-sh +build-aux/ltmain.sh +build-aux/missing +build-aux/py-compile +build-aux/test-driver +config.h.in +configure +configure.ac +dbus-python.pc.in +dbus/__init__.py +dbus/_compat.py +dbus/_dbus.py +dbus/_expat_introspect_parser.py +dbus/bus.py +dbus/connection.py +dbus/decorators.py +dbus/exceptions.py +dbus/gi_service.py +dbus/glib.py +dbus/gobject_service.py +dbus/lowlevel.py +dbus/mainloop/__init__.py +dbus/mainloop/glib.py +dbus/proxies.py +dbus/server.py +dbus/service.py +dbus/types.py +doc/API_CHANGES.txt +doc/HACKING.txt +doc/PY3PORT.txt +doc/tutorial.txt +examples/example-async-client.py +examples/example-client.py +examples/example-service.py +examples/example-signal-emitter.py +examples/example-signal-recipient.py +examples/gconf-proxy-client.py +examples/gconf-proxy-service2.py +examples/list-system-services.py +examples/unix-fd-client.py +examples/unix-fd-service.py +include/dbus/dbus-python.h +m4/am-check-python-headers.m4 +m4/ax_append_compile_flags.m4 +m4/ax_append_flag.m4 +m4/ax_append_link_flags.m4 +m4/ax_check_compile_flag.m4 +m4/ax_check_link_flag.m4 +m4/ax_compiler_flags.m4 +m4/ax_compiler_flags_cflags.m4 +m4/ax_compiler_flags_gir.m4 +m4/ax_compiler_flags_ldflags.m4 +m4/ax_generate_changelog.m4 +m4/ax_is_release.m4 +m4/ax_python_module.m4 +m4/ax_require_defined.m4 +m4/dbus-py-add-rst2htmlflag.m4 +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +m4/pkg.m4 +setup.py +test/TestSuitePythonService.service.in +test/cross-test-client.py +test/cross-test-server.py +test/crosstest.py +test/dbus_py_test.c +test/import-repeatedly.c +test/run-test.sh +test/test-client.py +test/test-exception-py2.py +test/test-exception-py3.py +test/test-p2p.py +test/test-service.py +test/test-signals.py +test/test-standalone.py +test/test-unusable-main-loop.py +test/tmp-session-bus.conf.in +test/wait-for-name.py +test/with-session-bus.sh +tools/check-c-style.sh +tools/check-coding-style.mk +tools/check-py-style.sh +tools/check-whitespace.sh diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..61e5a91 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,132 @@ +include .travis.yml +include .version +include AUTHORS +include COPYING +include ChangeLog +include INSTALL +include MANIFEST +include MANIFEST.in +include Makefile.am +include Makefile.in +include NEWS +include README +include _dbus_bindings/abstract.c +include _dbus_bindings/bus.c +include _dbus_bindings/bytes.c +include _dbus_bindings/compat-internal.h +include _dbus_bindings/conn-internal.h +include _dbus_bindings/conn-methods.c +include _dbus_bindings/conn.c +include _dbus_bindings/containers.c +include _dbus_bindings/dbus_bindings-internal.h +include _dbus_bindings/debug.c +include _dbus_bindings/exceptions.c +include _dbus_bindings/float.c +include _dbus_bindings/generic.c +include _dbus_bindings/int.c +include _dbus_bindings/libdbusconn.c +include _dbus_bindings/mainloop.c +include _dbus_bindings/message-append.c +include _dbus_bindings/message-get-args.c +include _dbus_bindings/message-internal.h +include _dbus_bindings/message.c +include _dbus_bindings/module.c +include _dbus_bindings/pending-call.c +include _dbus_bindings/server.c +include _dbus_bindings/signature.c +include _dbus_bindings/string.c +include _dbus_bindings/types-internal.h +include _dbus_bindings/unixfd.c +include _dbus_bindings/validation.c +include _dbus_glib_bindings/module.c +include aclocal.m4 +include build-aux/compile +include build-aux/config.guess +include build-aux/config.sub +include build-aux/depcomp +include build-aux/install-sh +include build-aux/ltmain.sh +include build-aux/missing +include build-aux/py-compile +include build-aux/test-driver +include config.h.in +include configure +include configure.ac +include dbus-python.pc.in +include dbus/__init__.py +include dbus/_compat.py +include dbus/_dbus.py +include dbus/_expat_introspect_parser.py +include dbus/bus.py +include dbus/connection.py +include dbus/decorators.py +include dbus/exceptions.py +include dbus/gi_service.py +include dbus/glib.py +include dbus/gobject_service.py +include dbus/lowlevel.py +include dbus/mainloop/__init__.py +include dbus/mainloop/glib.py +include dbus/proxies.py +include dbus/server.py +include dbus/service.py +include dbus/types.py +include doc/API_CHANGES.txt +include doc/HACKING.txt +include doc/PY3PORT.txt +include doc/tutorial.txt +include examples/example-async-client.py +include examples/example-client.py +include examples/example-service.py +include examples/example-signal-emitter.py +include examples/example-signal-recipient.py +include examples/gconf-proxy-client.py +include examples/gconf-proxy-service2.py +include examples/list-system-services.py +include examples/unix-fd-client.py +include examples/unix-fd-service.py +include include/dbus/dbus-python.h +include m4/am-check-python-headers.m4 +include m4/ax_append_compile_flags.m4 +include m4/ax_append_flag.m4 +include m4/ax_append_link_flags.m4 +include m4/ax_check_compile_flag.m4 +include m4/ax_check_link_flag.m4 +include m4/ax_compiler_flags.m4 +include m4/ax_compiler_flags_cflags.m4 +include m4/ax_compiler_flags_gir.m4 +include m4/ax_compiler_flags_ldflags.m4 +include m4/ax_generate_changelog.m4 +include m4/ax_is_release.m4 +include m4/ax_python_module.m4 +include m4/ax_require_defined.m4 +include m4/dbus-py-add-rst2htmlflag.m4 +include m4/libtool.m4 +include m4/ltoptions.m4 +include m4/ltsugar.m4 +include m4/ltversion.m4 +include m4/lt~obsolete.m4 +include m4/pkg.m4 +include setup.py +include test/TestSuitePythonService.service.in +include test/cross-test-client.py +include test/cross-test-server.py +include test/crosstest.py +include test/dbus_py_test.c +include test/import-repeatedly.c +include test/run-test.sh +include test/test-client.py +include test/test-exception-py2.py +include test/test-exception-py3.py +include test/test-p2p.py +include test/test-service.py +include test/test-signals.py +include test/test-standalone.py +include test/test-unusable-main-loop.py +include test/tmp-session-bus.conf.in +include test/wait-for-name.py +include test/with-session-bus.sh +include tools/check-c-style.sh +include tools/check-coding-style.mk +include tools/check-py-style.sh +include tools/check-whitespace.sh diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..423d7b4 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,456 @@ +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ +installed_testdir = ${libexecdir}/installed-tests/${PACKAGE_TARNAME} +installed_test_testdir = ${installed_testdir}/test +installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME} + +ACLOCAL_AMFLAGS = -I m4 + +CLEANFILES = \ + test/test-service.log \ + $(NULL) +EXTRA_DIST = \ + .travis.yml \ + AUTHORS \ + COPYING \ + ChangeLog \ + dbus-python.pc.in \ + examples/example-async-client.py \ + examples/example-client.py \ + examples/example-service.py \ + examples/example-signal-emitter.py \ + examples/example-signal-recipient.py \ + examples/gconf-proxy-client.py \ + examples/gconf-proxy-service2.py \ + examples/list-system-services.py \ + examples/unix-fd-client.py \ + examples/unix-fd-service.py \ + m4/am-check-python-headers.m4 \ + m4/dbus-py-add-rst2htmlflag.m4 \ + setup.py \ + test/TestSuitePythonService.service.in \ + test/tmp-session-bus.conf.in \ + tools/check-c-style.sh \ + tools/check-coding-style.mk \ + tools/check-py-style.sh \ + tools/check-whitespace.sh + tools/ci-build.sh \ + $(NULL) + +# === C code === + +AM_CPPFLAGS = \ + -include config.h \ + -I$(top_srcdir)/include \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(PYTHON_INCLUDES) \ + $(NULL) +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(NULL) +AM_LDFLAGS = \ + $(WARN_LDFLAGS) \ + $(NULL) + +pymod_ldflags = \ + -module \ + -avoid-version \ + $(NULL) +pymod_libadd = \ + $(NULL) + +if WINDOWS +# Win32 DLLs can't have undefined symbols (so this needs explicit linking +# against the Python DLL), and Python expects extensions to be *.pyd +# instead of *.dll +pymod_ldflags += \ + -no-undefined \ + -shrext ".pyd" \ + $(NULL) +pymod_libadd += \ + $(PYTHON_LIBS) \ + $(NULL) +endif + +pyexec_LTLIBRARIES = \ + _dbus_bindings.la \ + _dbus_glib_bindings.la \ + $(NULL) + +if ENABLE_INSTALLED_TESTS +nobase_installed_test_LTLIBRARIES = test/dbus_py_test.la +else +noinst_LTLIBRARIES = test/dbus_py_test.la +endif + +_dbus_bindings_la_LDFLAGS = \ + $(pymod_ldflags) \ + -export-symbols-regex \(PyInit__\|init_\)dbus_bindings \ + $(AM_LDFLAGS) \ + $(NULL) +_dbus_bindings_la_LIBADD = \ + $(pymod_libadd) \ + $(DBUS_LIBS) \ + $(NULL) +_dbus_bindings_la_SOURCES = \ + _dbus_bindings/abstract.c \ + _dbus_bindings/bus.c \ + _dbus_bindings/bytes.c \ + _dbus_bindings/compat-internal.h \ + _dbus_bindings/conn.c \ + _dbus_bindings/conn-internal.h \ + _dbus_bindings/conn-methods.c \ + _dbus_bindings/containers.c \ + _dbus_bindings/dbus_bindings-internal.h \ + _dbus_bindings/debug.c \ + _dbus_bindings/exceptions.c \ + _dbus_bindings/float.c \ + _dbus_bindings/generic.c \ + _dbus_bindings/int.c \ + _dbus_bindings/unixfd.c \ + _dbus_bindings/libdbusconn.c \ + _dbus_bindings/mainloop.c \ + _dbus_bindings/message-append.c \ + _dbus_bindings/message.c \ + _dbus_bindings/message-get-args.c \ + _dbus_bindings/message-internal.h \ + _dbus_bindings/module.c \ + _dbus_bindings/pending-call.c \ + _dbus_bindings/server.c \ + _dbus_bindings/signature.c \ + _dbus_bindings/string.c \ + _dbus_bindings/types-internal.h \ + _dbus_bindings/validation.c \ + $(NULL) + +_dbus_glib_bindings_la_LDFLAGS = \ + $(pymod_ldflags) \ + -export-symbols-regex \(PyInit__\|init_\)dbus_glib_bindings \ + $(AM_LDFLAGS) \ + $(NULL) +_dbus_glib_bindings_la_LIBADD = \ + $(pymod_libadd) \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(NULL) +_dbus_glib_bindings_la_SOURCES = \ + _dbus_glib_bindings/module.c \ + $(NULL) + +# unconditionally add an -rpath to force Libtool to build a shared library +test_dbus_py_test_la_LDFLAGS = \ + $(pymod_ldflags) \ + $(AM_LDFLAGS) \ + -rpath $(installed_testdir) \ + $(NULL) +test_dbus_py_test_la_LIBADD = $(DBUS_LIBS) +test_dbus_py_test_la_SOURCES = \ + include/dbus/dbus-python.h \ + test/dbus_py_test.c \ + $(NULL) + +# === dbus package === + +nobase_python_PYTHON = \ + dbus/bus.py \ + dbus/connection.py \ + dbus/_compat.py \ + dbus/_dbus.py \ + dbus/decorators.py \ + dbus/exceptions.py \ + dbus/_expat_introspect_parser.py \ + dbus/gi_service.py \ + dbus/glib.py \ + dbus/__init__.py \ + dbus/lowlevel.py \ + dbus/mainloop/__init__.py \ + dbus/mainloop/glib.py \ + dbus/proxies.py \ + dbus/server.py \ + dbus/service.py \ + dbus/types.py + +if !HAVE_PYTHON_3 +nobase_python_PYTHON += \ + dbus/gobject_service.py \ + $(NULL) +endif + +check_py_sources = $(nobase_python_PYTHON) +include $(top_srcdir)/tools/check-coding-style.mk + +# === Devel stuff === + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dbus-python.pc + +dbusincludedir = $(includedir)/dbus-1.0/dbus +dbusinclude_HEADERS = include/dbus/dbus-python.h + +# === Tests === + +cross-test-compile: all + +cross-test-server: + $(AM_TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-server.py +cross-test-client: + $(AM_TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-client.py + +AM_TESTS_ENVIRONMENT = \ + export DBUS_TOP_SRCDIR="$(abs_top_srcdir)"; \ + export DBUS_TOP_BUILDDIR="$(abs_top_builddir)"; \ + export DBUS_TEST_TMPDIR="$(abs_top_builddir)/test"; \ + export DBUS_TEST_UNINSTALLED=1; \ + export DBUS_PYTHON_VERSION='$(PACKAGE_VERSION)'; \ + export PYTHONPATH="$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/.libs:$(abs_top_builddir)/test/.libs"; \ + export PYTHON='$(PYTHON)'; \ + export DBUS_FATAL_WARNINGS=1; \ + $(NULL) + +TEST_EXTENSIONS = .sh .py + +if HAVE_DBUS_RUN_SESSION +LOG_COMPILER = $(DBUS_RUN_SESSION) \ + --config-file=$(top_builddir)/test/tmp-session-bus.conf \ + -- +installed_log_compiler = $(DBUS_RUN_SESSION) \ + --config-file=$(installed_testdir)/test/tmp-session-bus.conf \ + -- +else +LOG_COMPILER = $(top_srcdir)/test/with-session-bus.sh \ + --config-file=$(top_builddir)/test/tmp-session-bus.conf \ + -- +installed_log_compiler = $(installed_testdir)/test/with-session-bus.sh \ + --config-file=$(installed_testdir)/test/tmp-session-bus.conf \ + -- +endif + +installed_log_compiler += \ + env \ + PYTHON=$(PYTHON) \ + DBUS_TOP_SRCDIR=$(installed_testdir) \ + DBUS_TOP_BUILDDIR=$(installed_testdir) \ + $(NULL) + +SH_LOG_COMPILER = $(LOG_COMPILER) $(SHELL) +PY_LOG_COMPILER = $(LOG_COMPILER) $(PYTHON) + +dist_test_sh = \ + test/run-test.sh \ + $(NULL) + +dist_test_py = \ + test/test-client.py \ + test/test-p2p.py \ + test/test-signals.py \ + test/test-standalone.py \ + test/test-unusable-main-loop.py \ + $(NULL) + +dist_test_extra_python = \ + test/crosstest.py \ + $(NULL) + +dist_test_extra_scripts = \ + test/cross-test-client.py \ + test/cross-test-server.py \ + test/test-service.py \ + test/wait-for-name.py \ + test/with-session-bus.sh \ + $(NULL) + +if HAVE_PYTHON_3 +dist_test_py += test/test-exception-py3.py +else +dist_test_py += test/test-exception-py2.py +endif + +test_programs = \ + test/test-import-repeatedly \ + $(NULL) + +test_test_import_repeatedly_SOURCES = test/import-repeatedly.c +test_test_import_repeatedly_CPPFLAGS = $(PYTHON_INCLUDES) +test_test_import_repeatedly_LDADD = $(PYTHON_LIBS) + +TESTS = \ + $(dist_test_py) \ + $(dist_test_sh) \ + $(test_programs) \ + $(NULL) + +noinst_DATA = \ + test/TestSuitePythonService.service \ + test/tmp-session-bus.conf \ + $(NULL) +CLEANFILES += $(noinst_DATA) + +installed_test_test_data = \ + test/installable/TestSuitePythonService.service \ + test/installable/tmp-session-bus.conf \ + $(NULL) +CLEANFILES += $(installed_test_test_data) + +$(noinst_DATA): test/%: test/%.in + @$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) \ + -e 's|[@]PYTHON[@]|$(PYTHON)|g' \ + -e 's|[@]G_TEST_SRCDIR[@]|$(abs_top_srcdir)|g' \ + -e 's|[@]G_TEST_BUILDDIR[@]|$(abs_top_builddir)|g' \ + $< > $@ + +$(installed_test_test_data): test/installable/%: test/%.in + @$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) \ + -e 's|[@]PYTHON[@]|$(PYTHON)|g' \ + -e 's|[@]G_TEST_SRCDIR[@]|$(installed_testdir)|g' \ + -e 's|[@]G_TEST_BUILDDIR[@]|$(installed_testdir)|g' \ + $< > $@ + +if ENABLE_INSTALLED_TESTS +nobase_installed_test_PROGRAMS = $(test_programs) +nobase_dist_installed_test_SCRIPTS = \ + $(dist_test_py) \ + $(dist_test_sh) \ + $(dist_test_extra_scripts) \ + $(NULL) +nobase_dist_installed_test_PYTHON = \ + $(dist_test_extra_python) \ + $(NULL) +installed_test_test_DATA = $(installed_test_test_data) +installed_test_meta_DATA = $(installed_test_metadata) +else +noinst_PROGRAMS = $(test_programs) +dist_noinst_SCRIPTS = \ + $(dist_test_py) \ + $(dist_test_sh) \ + $(dist_test_extra_scripts) \ + $(NULL) +endif + +installed_test_metadata = \ + $(patsubst %,%.test,$(dist_test_py)) \ + $(patsubst %,%.test,$(dist_test_sh)) \ + $(patsubst %,%.test,$(test_programs)) \ + $(NULL) +CLEANFILES += $(installed_test_metadata) + +$(patsubst %,%.test,$(dist_test_py)): %.test: Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_log_compiler) $(PYTHON) $(installed_testdir)/$*' >> $@.tmp; \ + mv $@.tmp $@) + +$(patsubst %,%.test,$(dist_test_sh)): %.test: Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_log_compiler) $(installed_testdir)/$*' >> $@.tmp; \ + mv $@.tmp $@) + +$(patsubst %,%.test,$(test_programs)): %.test: Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_log_compiler) $(installed_testdir)/$*$(EXEEXT)' >> $@.tmp; \ + mv $@.tmp $@) + +# === Documentation === + +@GENERATE_CHANGELOG_RULES@ + +dist-hook: dist-ChangeLog + echo $(VERSION) > $(distdir)/.version + touch $(distdir)/MANIFEST + touch $(distdir)/MANIFEST.in + ( cd $(distdir) && find -type d -o -print ) | \ + LC_ALL=C sort | \ + $(SED) -e 's|^\./||' \ + > $(distdir)/MANIFEST + sed -e 's/.*/include &/' < $(distdir)/MANIFEST > $(distdir)/MANIFEST.in + +TXT_RSTDOCS = \ + doc/tutorial.txt \ + doc/API_CHANGES.txt \ + doc/HACKING.txt \ + doc/PY3PORT.txt \ + $(NULL) +RSTDOCS = \ + README \ + NEWS \ + $(NULL) +dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS) + +maintainer-upload: + rsync -tvpP --chmod=ugo=r $(DIST_ARCHIVES) $(DIST_ARCHIVES:%=%.asc) \ + dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus-python/ + +maintainer-update-website: _maintainer-update-apidocs \ + _maintainer-update-htmldocs + +if ENABLE_DOCS +_maintainer-update-htmldocs: $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS) + rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc \ + $(patsubst %,$(srcdir)/%,$(RSTDOCS)) $(HTML_RSTDOCS) \ + dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/ + +HTML_TXT_RSTDOCS = $(patsubst %.txt,%.html,$(TXT_RSTDOCS)) +HTML_RSTDOCS = $(patsubst %,%.html,$(RSTDOCS)) +nodist_doc_DATA = $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS) + +CLEANFILES += $(nodist_doc_DATA) + +$(HTML_TXT_RSTDOCS) : %.html: %.txt + $(INSTALL) -d doc + $(RST2HTML) $(RST2HTMLFLAGS) $< $@ +$(HTML_RSTDOCS) : %.html: % + $(RST2HTML) $(RST2HTMLFLAGS) $< $@ +else +_maintainer-update-htmldocs: + @echo "*** Not updating the HTML docs on the website - install rst2html" + @echo "*** from http://docutils.sourceforge.net/ and configure with " + @echo "*** --enable-html-docs" +endif + +if ENABLE_API_DOCS +all: api/index.html + +clean-local: + rm -rf api + +APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs + +api api/index.html: $(nobase_python_PYTHON) \ + _dbus_bindings.la \ + _dbus_glib_bindings.la + rm -rf api + mkdir api + cd $(abs_top_srcdir) && \ + PYTHONPATH=$(APIDOC_PYTHONPATH) DBUS_PYTHON_NO_DEPRECATED=1 \ + $(PYTHON) -Wignore::DeprecationWarning \ + $(EPYDOC) -o $(abs_top_builddir)/api --html \ + --docformat restructuredtext -v \ + `find dbus -name '*.py' \ + | sed -e 's#/__init__\.py##g' \ + -e 's/\.py\>//g' -e 's#/#.#'g` \ + || { rm -rf api; exit 1; } + +_maintainer-update-apidocs: api + rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX api/ \ + dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/api/ +else +_maintainer-update-apidocs: + @echo "*** Not updating the API docs on the website - install epydoc 3" + @echo "*** alpha (or newer) and configure with --enable-api-docs" +endif + +check_c_sources = \ + $(_dbus_bindings_la_SOURCES) \ + $(_dbus_glib_bindings_la_SOURCES) \ + $(NULL) + +include $(top_srcdir)/tools/check-coding-style.mk + +.PHONY: cross-test-compile cross-test-server cross-test-client \ + always-rebuild maintainer-update-website \ + _maintainer-update-apidocs _maintainer-update-htmldocs \ + maintainer-upload diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..0b42fc3 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,2368 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + + + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ + +# Win32 DLLs can't have undefined symbols (so this needs explicit linking +# against the Python DLL), and Python expects extensions to be *.pyd +# instead of *.dll +@WINDOWS_TRUE@am__append_1 = \ +@WINDOWS_TRUE@ -no-undefined \ +@WINDOWS_TRUE@ -shrext ".pyd" \ +@WINDOWS_TRUE@ $(NULL) + +@WINDOWS_TRUE@am__append_2 = \ +@WINDOWS_TRUE@ $(PYTHON_LIBS) \ +@WINDOWS_TRUE@ $(NULL) + +@HAVE_PYTHON_3_FALSE@am__append_3 = \ +@HAVE_PYTHON_3_FALSE@ dbus/gobject_service.py \ +@HAVE_PYTHON_3_FALSE@ $(NULL) + +@HAVE_PYTHON_3_TRUE@am__append_4 = test/test-exception-py3.py +@HAVE_PYTHON_3_FALSE@am__append_5 = test/test-exception-py2.py +TESTS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_1) +@ENABLE_INSTALLED_TESTS_TRUE@nobase_installed_test_PROGRAMS = \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(am__EXEEXT_1) +@ENABLE_INSTALLED_TESTS_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) +@ENABLE_DOCS_TRUE@am__append_6 = $(nodist_doc_DATA) +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_append_link_flags.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_link_flag.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_generate_changelog.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_python_module.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/dbus-py-add-rst2htmlflag.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__dist_noinst_SCRIPTS_DIST) \ + $(am__nobase_dist_installed_test_SCRIPTS_DIST) \ + $(am__nobase_dist_installed_test_PYTHON_DIST) \ + $(am__nobase_python_PYTHON_DIST) $(dist_doc_DATA) \ + $(dbusinclude_HEADERS) $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = dbus-python.pc +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pythondir)" \ + "$(DESTDIR)$(docdir)" "$(DESTDIR)$(installed_test_metadir)" \ + "$(DESTDIR)$(installed_test_testdir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(dbusincludedir)" +LTLIBRARIES = $(nobase_installed_test_LTLIBRARIES) \ + $(noinst_LTLIBRARIES) $(pyexec_LTLIBRARIES) +am__DEPENDENCIES_1 = +@WINDOWS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) +_dbus_bindings_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_1) +am__dirstamp = $(am__leading_dot)dirstamp +am__dbus_bindings_la_OBJECTS = _dbus_bindings/abstract.lo \ + _dbus_bindings/bus.lo _dbus_bindings/bytes.lo \ + _dbus_bindings/conn.lo _dbus_bindings/conn-methods.lo \ + _dbus_bindings/containers.lo _dbus_bindings/debug.lo \ + _dbus_bindings/exceptions.lo _dbus_bindings/float.lo \ + _dbus_bindings/generic.lo _dbus_bindings/int.lo \ + _dbus_bindings/unixfd.lo _dbus_bindings/libdbusconn.lo \ + _dbus_bindings/mainloop.lo _dbus_bindings/message-append.lo \ + _dbus_bindings/message.lo _dbus_bindings/message-get-args.lo \ + _dbus_bindings/module.lo _dbus_bindings/pending-call.lo \ + _dbus_bindings/server.lo _dbus_bindings/signature.lo \ + _dbus_bindings/string.lo _dbus_bindings/validation.lo +_dbus_bindings_la_OBJECTS = $(am__dbus_bindings_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +_dbus_bindings_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(_dbus_bindings_la_LDFLAGS) $(LDFLAGS) \ + -o $@ +_dbus_glib_bindings_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__dbus_glib_bindings_la_OBJECTS = _dbus_glib_bindings/module.lo +_dbus_glib_bindings_la_OBJECTS = $(am__dbus_glib_bindings_la_OBJECTS) +_dbus_glib_bindings_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(_dbus_glib_bindings_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +test_dbus_py_test_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_test_dbus_py_test_la_OBJECTS = test/dbus_py_test.lo +test_dbus_py_test_la_OBJECTS = $(am_test_dbus_py_test_la_OBJECTS) +test_dbus_py_test_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(test_dbus_py_test_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@ENABLE_INSTALLED_TESTS_FALSE@am_test_dbus_py_test_la_rpath = +@ENABLE_INSTALLED_TESTS_TRUE@am_test_dbus_py_test_la_rpath = -rpath \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(installed_testdir)/test +am__EXEEXT_1 = test/test-import-repeatedly$(EXEEXT) +PROGRAMS = $(nobase_installed_test_PROGRAMS) $(noinst_PROGRAMS) +am_test_test_import_repeatedly_OBJECTS = \ + test/test_test_import_repeatedly-import-repeatedly.$(OBJEXT) +test_test_import_repeatedly_OBJECTS = \ + $(am_test_test_import_repeatedly_OBJECTS) +test_test_import_repeatedly_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__dist_noinst_SCRIPTS_DIST = test/test-client.py test/test-p2p.py \ + test/test-signals.py test/test-standalone.py \ + test/test-unusable-main-loop.py test/test-exception-py3.py \ + test/test-exception-py2.py test/run-test.sh \ + test/cross-test-client.py test/cross-test-server.py \ + test/test-service.py test/wait-for-name.py \ + test/with-session-bus.sh +am__nobase_dist_installed_test_SCRIPTS_DIST = test/test-client.py \ + test/test-p2p.py test/test-signals.py test/test-standalone.py \ + test/test-unusable-main-loop.py test/test-exception-py3.py \ + test/test-exception-py2.py test/run-test.sh \ + test/cross-test-client.py test/cross-test-server.py \ + test/test-service.py test/wait-for-name.py \ + test/with-session-bus.sh +SCRIPTS = $(dist_noinst_SCRIPTS) $(nobase_dist_installed_test_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(_dbus_bindings_la_SOURCES) \ + $(_dbus_glib_bindings_la_SOURCES) \ + $(test_dbus_py_test_la_SOURCES) \ + $(test_test_import_repeatedly_SOURCES) +DIST_SOURCES = $(_dbus_bindings_la_SOURCES) \ + $(_dbus_glib_bindings_la_SOURCES) \ + $(test_dbus_py_test_la_SOURCES) \ + $(test_test_import_repeatedly_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__nobase_dist_installed_test_PYTHON_DIST = test/crosstest.py +am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) +am__pep3147_tweak = \ + sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' +am__nobase_python_PYTHON_DIST = dbus/bus.py dbus/connection.py \ + dbus/_compat.py dbus/_dbus.py dbus/decorators.py \ + dbus/exceptions.py dbus/_expat_introspect_parser.py \ + dbus/gi_service.py dbus/glib.py dbus/__init__.py \ + dbus/lowlevel.py dbus/mainloop/__init__.py \ + dbus/mainloop/glib.py dbus/proxies.py dbus/server.py \ + dbus/service.py dbus/types.py dbus/gobject_service.py +py_compile = $(top_srcdir)/build-aux/py-compile +DATA = $(dist_doc_DATA) $(installed_test_meta_DATA) \ + $(installed_test_test_DATA) $(nodist_doc_DATA) $(noinst_DATA) \ + $(pkgconfig_DATA) +HEADERS = $(dbusinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +AM_RECURSIVE_TARGETS = cscope check recheck +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +am__EXEEXT_2 = test/test-client.py test/test-p2p.py \ + test/test-signals.py test/test-standalone.py \ + test/test-unusable-main-loop.py $(am__append_4) \ + $(am__append_5) +am__EXEEXT_3 = test/run-test.sh +TEST_SUITE_LOG = test-suite.log +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +am__test_logs3 = $(am__test_logs2:.sh.log=.log) +SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) +TEST_LOGS = $(am__test_logs3:.py.log=.log) +PY_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +PY_LOG_COMPILE = $(PY_LOG_COMPILER) $(AM_PY_LOG_FLAGS) $(PY_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/dbus-python.pc.in $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/build-aux/py-compile \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/tools/check-coding-style.mk AUTHORS COPYING \ + ChangeLog INSTALL NEWS README build-aux/compile \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ + build-aux/py-compile +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +DIST_TARGETS = dist-gzip +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ +DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ +DBUS_LIBS = @DBUS_LIBS@ +DBUS_PYTHON_MAJOR_VERSION = @DBUS_PYTHON_MAJOR_VERSION@ +DBUS_PYTHON_MICRO_VERSION = @DBUS_PYTHON_MICRO_VERSION@ +DBUS_PYTHON_MINOR_VERSION = @DBUS_PYTHON_MINOR_VERSION@ +DBUS_RUN_SESSION = @DBUS_RUN_SESSION@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EPYDOC = @EPYDOC@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GIT = @GIT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLATFORM = @PLATFORM@ +PYTHON = @PYTHON@ +PYTHON_CONFIG = @PYTHON_CONFIG@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RST2HTML = @RST2HTML@ +RST2HTMLFLAGS = @RST2HTMLFLAGS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +installed_testdir = ${libexecdir}/installed-tests/${PACKAGE_TARNAME} +installed_test_testdir = ${installed_testdir}/test +installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME} +ACLOCAL_AMFLAGS = -I m4 +CLEANFILES = test/test-service.log $(NULL) $(noinst_DATA) \ + $(installed_test_test_data) $(installed_test_metadata) \ + $(am__append_6) +EXTRA_DIST = \ + .travis.yml \ + AUTHORS \ + COPYING \ + ChangeLog \ + dbus-python.pc.in \ + examples/example-async-client.py \ + examples/example-client.py \ + examples/example-service.py \ + examples/example-signal-emitter.py \ + examples/example-signal-recipient.py \ + examples/gconf-proxy-client.py \ + examples/gconf-proxy-service2.py \ + examples/list-system-services.py \ + examples/unix-fd-client.py \ + examples/unix-fd-service.py \ + m4/am-check-python-headers.m4 \ + m4/dbus-py-add-rst2htmlflag.m4 \ + setup.py \ + test/TestSuitePythonService.service.in \ + test/tmp-session-bus.conf.in \ + tools/check-c-style.sh \ + tools/check-coding-style.mk \ + tools/check-py-style.sh \ + tools/check-whitespace.sh + + +# === C code === +AM_CPPFLAGS = \ + -include config.h \ + -I$(top_srcdir)/include \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(PYTHON_INCLUDES) \ + $(NULL) + +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(WARN_LDFLAGS) \ + $(NULL) + +pymod_ldflags = -module -avoid-version $(NULL) $(am__append_1) +pymod_libadd = $(NULL) $(am__append_2) +pyexec_LTLIBRARIES = \ + _dbus_bindings.la \ + _dbus_glib_bindings.la \ + $(NULL) + +@ENABLE_INSTALLED_TESTS_TRUE@nobase_installed_test_LTLIBRARIES = test/dbus_py_test.la +@ENABLE_INSTALLED_TESTS_FALSE@noinst_LTLIBRARIES = test/dbus_py_test.la +_dbus_bindings_la_LDFLAGS = \ + $(pymod_ldflags) \ + -export-symbols-regex \(PyInit__\|init_\)dbus_bindings \ + $(AM_LDFLAGS) \ + $(NULL) + +_dbus_bindings_la_LIBADD = \ + $(pymod_libadd) \ + $(DBUS_LIBS) \ + $(NULL) + +_dbus_bindings_la_SOURCES = \ + _dbus_bindings/abstract.c \ + _dbus_bindings/bus.c \ + _dbus_bindings/bytes.c \ + _dbus_bindings/compat-internal.h \ + _dbus_bindings/conn.c \ + _dbus_bindings/conn-internal.h \ + _dbus_bindings/conn-methods.c \ + _dbus_bindings/containers.c \ + _dbus_bindings/dbus_bindings-internal.h \ + _dbus_bindings/debug.c \ + _dbus_bindings/exceptions.c \ + _dbus_bindings/float.c \ + _dbus_bindings/generic.c \ + _dbus_bindings/int.c \ + _dbus_bindings/unixfd.c \ + _dbus_bindings/libdbusconn.c \ + _dbus_bindings/mainloop.c \ + _dbus_bindings/message-append.c \ + _dbus_bindings/message.c \ + _dbus_bindings/message-get-args.c \ + _dbus_bindings/message-internal.h \ + _dbus_bindings/module.c \ + _dbus_bindings/pending-call.c \ + _dbus_bindings/server.c \ + _dbus_bindings/signature.c \ + _dbus_bindings/string.c \ + _dbus_bindings/types-internal.h \ + _dbus_bindings/validation.c \ + $(NULL) + +_dbus_glib_bindings_la_LDFLAGS = \ + $(pymod_ldflags) \ + -export-symbols-regex \(PyInit__\|init_\)dbus_glib_bindings \ + $(AM_LDFLAGS) \ + $(NULL) + +_dbus_glib_bindings_la_LIBADD = \ + $(pymod_libadd) \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(NULL) + +_dbus_glib_bindings_la_SOURCES = \ + _dbus_glib_bindings/module.c \ + $(NULL) + + +# unconditionally add an -rpath to force Libtool to build a shared library +test_dbus_py_test_la_LDFLAGS = \ + $(pymod_ldflags) \ + $(AM_LDFLAGS) \ + -rpath $(installed_testdir) \ + $(NULL) + +test_dbus_py_test_la_LIBADD = $(DBUS_LIBS) +test_dbus_py_test_la_SOURCES = \ + include/dbus/dbus-python.h \ + test/dbus_py_test.c \ + $(NULL) + + +# === dbus package === +nobase_python_PYTHON = dbus/bus.py dbus/connection.py dbus/_compat.py \ + dbus/_dbus.py dbus/decorators.py dbus/exceptions.py \ + dbus/_expat_introspect_parser.py dbus/gi_service.py \ + dbus/glib.py dbus/__init__.py dbus/lowlevel.py \ + dbus/mainloop/__init__.py dbus/mainloop/glib.py \ + dbus/proxies.py dbus/server.py dbus/service.py dbus/types.py \ + $(am__append_3) +check_py_sources = $(nobase_python_PYTHON) + +# === Devel stuff === +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dbus-python.pc +dbusincludedir = $(includedir)/dbus-1.0/dbus +dbusinclude_HEADERS = include/dbus/dbus-python.h +AM_TESTS_ENVIRONMENT = \ + export DBUS_TOP_SRCDIR="$(abs_top_srcdir)"; \ + export DBUS_TOP_BUILDDIR="$(abs_top_builddir)"; \ + export DBUS_TEST_TMPDIR="$(abs_top_builddir)/test"; \ + export DBUS_TEST_UNINSTALLED=1; \ + export DBUS_PYTHON_VERSION='$(PACKAGE_VERSION)'; \ + export PYTHONPATH="$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/.libs:$(abs_top_builddir)/test/.libs"; \ + export PYTHON='$(PYTHON)'; \ + export DBUS_FATAL_WARNINGS=1; \ + $(NULL) + +TEST_EXTENSIONS = .sh .py +@HAVE_DBUS_RUN_SESSION_FALSE@LOG_COMPILER = $(top_srcdir)/test/with-session-bus.sh \ +@HAVE_DBUS_RUN_SESSION_FALSE@ --config-file=$(top_builddir)/test/tmp-session-bus.conf \ +@HAVE_DBUS_RUN_SESSION_FALSE@ -- + +@HAVE_DBUS_RUN_SESSION_TRUE@LOG_COMPILER = $(DBUS_RUN_SESSION) \ +@HAVE_DBUS_RUN_SESSION_TRUE@ --config-file=$(top_builddir)/test/tmp-session-bus.conf \ +@HAVE_DBUS_RUN_SESSION_TRUE@ -- + +@HAVE_DBUS_RUN_SESSION_FALSE@installed_log_compiler = $(installed_testdir)/test/with-session-bus.sh \ +@HAVE_DBUS_RUN_SESSION_FALSE@ --config-file=$(installed_testdir)/test/tmp-session-bus.conf \ +@HAVE_DBUS_RUN_SESSION_FALSE@ -- env PYTHON=$(PYTHON) \ +@HAVE_DBUS_RUN_SESSION_FALSE@ DBUS_TOP_SRCDIR=$(installed_testdir) \ +@HAVE_DBUS_RUN_SESSION_FALSE@ DBUS_TOP_BUILDDIR=$(installed_testdir) \ +@HAVE_DBUS_RUN_SESSION_FALSE@ $(NULL) +@HAVE_DBUS_RUN_SESSION_TRUE@installed_log_compiler = \ +@HAVE_DBUS_RUN_SESSION_TRUE@ $(DBUS_RUN_SESSION) \ +@HAVE_DBUS_RUN_SESSION_TRUE@ --config-file=$(installed_testdir)/test/tmp-session-bus.conf \ +@HAVE_DBUS_RUN_SESSION_TRUE@ -- env PYTHON=$(PYTHON) \ +@HAVE_DBUS_RUN_SESSION_TRUE@ DBUS_TOP_SRCDIR=$(installed_testdir) \ +@HAVE_DBUS_RUN_SESSION_TRUE@ DBUS_TOP_BUILDDIR=$(installed_testdir) \ +@HAVE_DBUS_RUN_SESSION_TRUE@ $(NULL) +SH_LOG_COMPILER = $(LOG_COMPILER) $(SHELL) +PY_LOG_COMPILER = $(LOG_COMPILER) $(PYTHON) +dist_test_sh = \ + test/run-test.sh \ + $(NULL) + +dist_test_py = test/test-client.py test/test-p2p.py \ + test/test-signals.py test/test-standalone.py \ + test/test-unusable-main-loop.py $(NULL) $(am__append_4) \ + $(am__append_5) +dist_test_extra_python = \ + test/crosstest.py \ + $(NULL) + +dist_test_extra_scripts = \ + test/cross-test-client.py \ + test/cross-test-server.py \ + test/test-service.py \ + test/wait-for-name.py \ + test/with-session-bus.sh \ + $(NULL) + +test_programs = \ + test/test-import-repeatedly \ + $(NULL) + +test_test_import_repeatedly_SOURCES = test/import-repeatedly.c +test_test_import_repeatedly_CPPFLAGS = $(PYTHON_INCLUDES) +test_test_import_repeatedly_LDADD = $(PYTHON_LIBS) +noinst_DATA = \ + test/TestSuitePythonService.service \ + test/tmp-session-bus.conf \ + $(NULL) + +installed_test_test_data = \ + test/installable/TestSuitePythonService.service \ + test/installable/tmp-session-bus.conf \ + $(NULL) + +@ENABLE_INSTALLED_TESTS_TRUE@nobase_dist_installed_test_SCRIPTS = \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_py) \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_sh) \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_extra_scripts) \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(NULL) + +@ENABLE_INSTALLED_TESTS_TRUE@nobase_dist_installed_test_PYTHON = \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_extra_python) \ +@ENABLE_INSTALLED_TESTS_TRUE@ $(NULL) + +@ENABLE_INSTALLED_TESTS_TRUE@installed_test_test_DATA = $(installed_test_test_data) +@ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_test_metadata) +@ENABLE_INSTALLED_TESTS_FALSE@dist_noinst_SCRIPTS = \ +@ENABLE_INSTALLED_TESTS_FALSE@ $(dist_test_py) \ +@ENABLE_INSTALLED_TESTS_FALSE@ $(dist_test_sh) \ +@ENABLE_INSTALLED_TESTS_FALSE@ $(dist_test_extra_scripts) \ +@ENABLE_INSTALLED_TESTS_FALSE@ $(NULL) + +installed_test_metadata = \ + $(patsubst %,%.test,$(dist_test_py)) \ + $(patsubst %,%.test,$(dist_test_sh)) \ + $(patsubst %,%.test,$(test_programs)) \ + $(NULL) + +TXT_RSTDOCS = \ + doc/tutorial.txt \ + doc/API_CHANGES.txt \ + doc/HACKING.txt \ + doc/PY3PORT.txt \ + $(NULL) + +RSTDOCS = \ + README \ + NEWS \ + $(NULL) + +dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS) +@ENABLE_DOCS_TRUE@HTML_TXT_RSTDOCS = $(patsubst %.txt,%.html,$(TXT_RSTDOCS)) +@ENABLE_DOCS_TRUE@HTML_RSTDOCS = $(patsubst %,%.html,$(RSTDOCS)) +@ENABLE_DOCS_TRUE@nodist_doc_DATA = $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS) +@ENABLE_API_DOCS_TRUE@APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs +check_c_sources = \ + $(_dbus_bindings_la_SOURCES) \ + $(_dbus_glib_bindings_la_SOURCES) \ + $(NULL) + +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .log .o .obj .py .py$(EXEEXT) .sh .sh$(EXEEXT) .trs +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/tools/check-coding-style.mk $(top_srcdir)/tools/check-coding-style.mk $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/tools/check-coding-style.mk $(top_srcdir)/tools/check-coding-style.mk $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 +dbus-python.pc: $(top_builddir)/config.status $(srcdir)/dbus-python.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + +install-nobase_installed_testLTLIBRARIES: $(nobase_installed_test_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(nobase_installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ + fi; \ + for p in $$list; do if test -f "$$p"; then echo "$$p $$p"; else :; fi; done | \ + sed '/ .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { cur = "." } \ + { if ($$2 == cur) { files = files " " $$1 } \ + else { print cur, files; files = $$1; cur = $$2 } } \ + END { print cur, files }' | \ + while read dir files; do \ + test -z "$$files" || { \ + test "x$$dir" = x. || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)/$$dir"; }; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$files '$(DESTDIR)$(installed_testdir)/$$dir'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$files "$(DESTDIR)$(installed_testdir)/$$dir" || exit $$?; \ + }; \ + done + +uninstall-nobase_installed_testLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(nobase_installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ + for p in $$list; do \ + f=$$p; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installed_testdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installed_testdir)/$$f"; \ + done + +clean-nobase_installed_testLTLIBRARIES: + -test -z "$(nobase_installed_test_LTLIBRARIES)" || rm -f $(nobase_installed_test_LTLIBRARIES) + @list='$(nobase_installed_test_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(pyexec_LTLIBRARIES)'; test -n "$(pyexecdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(pyexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pyexecdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pyexecdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pyexecdir)"; \ + } + +uninstall-pyexecLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pyexec_LTLIBRARIES)'; test -n "$(pyexecdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \ + done + +clean-pyexecLTLIBRARIES: + -test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES) + @list='$(pyexec_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +_dbus_bindings/$(am__dirstamp): + @$(MKDIR_P) _dbus_bindings + @: > _dbus_bindings/$(am__dirstamp) +_dbus_bindings/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) _dbus_bindings/$(DEPDIR) + @: > _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/abstract.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/bus.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/bytes.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/conn.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/conn-methods.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/containers.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/debug.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/exceptions.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/float.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/generic.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/int.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/unixfd.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/libdbusconn.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/mainloop.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/message-append.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/message.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/message-get-args.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/module.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/pending-call.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/server.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/signature.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/string.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_bindings/validation.lo: _dbus_bindings/$(am__dirstamp) \ + _dbus_bindings/$(DEPDIR)/$(am__dirstamp) + +_dbus_bindings.la: $(_dbus_bindings_la_OBJECTS) $(_dbus_bindings_la_DEPENDENCIES) $(EXTRA__dbus_bindings_la_DEPENDENCIES) + $(AM_V_CCLD)$(_dbus_bindings_la_LINK) -rpath $(pyexecdir) $(_dbus_bindings_la_OBJECTS) $(_dbus_bindings_la_LIBADD) $(LIBS) +_dbus_glib_bindings/$(am__dirstamp): + @$(MKDIR_P) _dbus_glib_bindings + @: > _dbus_glib_bindings/$(am__dirstamp) +_dbus_glib_bindings/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) _dbus_glib_bindings/$(DEPDIR) + @: > _dbus_glib_bindings/$(DEPDIR)/$(am__dirstamp) +_dbus_glib_bindings/module.lo: _dbus_glib_bindings/$(am__dirstamp) \ + _dbus_glib_bindings/$(DEPDIR)/$(am__dirstamp) + +_dbus_glib_bindings.la: $(_dbus_glib_bindings_la_OBJECTS) $(_dbus_glib_bindings_la_DEPENDENCIES) $(EXTRA__dbus_glib_bindings_la_DEPENDENCIES) + $(AM_V_CCLD)$(_dbus_glib_bindings_la_LINK) -rpath $(pyexecdir) $(_dbus_glib_bindings_la_OBJECTS) $(_dbus_glib_bindings_la_LIBADD) $(LIBS) +test/$(am__dirstamp): + @$(MKDIR_P) test + @: > test/$(am__dirstamp) +test/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) test/$(DEPDIR) + @: > test/$(DEPDIR)/$(am__dirstamp) +test/dbus_py_test.lo: test/$(am__dirstamp) \ + test/$(DEPDIR)/$(am__dirstamp) + +test/dbus_py_test.la: $(test_dbus_py_test_la_OBJECTS) $(test_dbus_py_test_la_DEPENDENCIES) $(EXTRA_test_dbus_py_test_la_DEPENDENCIES) test/$(am__dirstamp) + $(AM_V_CCLD)$(test_dbus_py_test_la_LINK) $(am_test_dbus_py_test_la_rpath) $(test_dbus_py_test_la_OBJECTS) $(test_dbus_py_test_la_LIBADD) $(LIBS) +install-nobase_installed_testPROGRAMS: $(nobase_installed_test_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(nobase_installed_test_PROGRAMS)'; test -n "$(installed_testdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|[^/]*$$||; s|^$$|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + case $$type in \ + d) echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)/$$dir" || exit $$?;; \ + f) \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(installed_testdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(installed_testdir)$$dir" || exit $$?; \ + } \ + ;; esac \ + ; done + +uninstall-nobase_installed_testPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(nobase_installed_test_PROGRAMS)'; test -n "$(installed_testdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + -e 'x;s,[^/]*$$,,;G;s,\n,,' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(installed_testdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(installed_testdir)" && rm -f $$files + +clean-nobase_installed_testPROGRAMS: + @list='$(nobase_installed_test_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +test/test_test_import_repeatedly-import-repeatedly.$(OBJEXT): \ + test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + +test/test-import-repeatedly$(EXEEXT): $(test_test_import_repeatedly_OBJECTS) $(test_test_import_repeatedly_DEPENDENCIES) $(EXTRA_test_test_import_repeatedly_DEPENDENCIES) test/$(am__dirstamp) + @rm -f test/test-import-repeatedly$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_test_import_repeatedly_OBJECTS) $(test_test_import_repeatedly_LDADD) $(LIBS) +install-nobase_dist_installed_testSCRIPTS: $(nobase_dist_installed_test_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(nobase_dist_installed_test_SCRIPTS)'; test -n "$(installed_testdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ + fi; \ + $(am__nobase_strip_setup); \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e "s|$$srcdirstrip/||" -e 'h;s|[^/]*$$||; s|^$$|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + case $$type in \ + d) echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)/$$dir" || exit $$?;; \ + f) \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(installed_testdir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(installed_testdir)$$dir" || exit $$?; \ + } \ + ;; esac \ + ; done + +uninstall-nobase_dist_installed_testSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(nobase_dist_installed_test_SCRIPTS)'; test -n "$(installed_testdir)" || exit 0; \ + $(am__nobase_strip_setup); \ + files=`$(am__nobase_strip) \ + -e 'h;s,.*/,,;$(transform);x;s|[^/]*$$||;G;s,\n,,'`; \ + dir='$(DESTDIR)$(installed_testdir)'; $(am__uninstall_files_from_dir) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f _dbus_bindings/*.$(OBJEXT) + -rm -f _dbus_bindings/*.lo + -rm -f _dbus_glib_bindings/*.$(OBJEXT) + -rm -f _dbus_glib_bindings/*.lo + -rm -f test/*.$(OBJEXT) + -rm -f test/*.lo + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/abstract.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/bus.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/bytes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/conn-methods.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/conn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/containers.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/debug.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/exceptions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/float.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/generic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/int.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/libdbusconn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/mainloop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/message-append.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/message-get-args.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/message.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/pending-call.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/server.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/signature.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/string.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/unixfd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_bindings/$(DEPDIR)/validation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@_dbus_glib_bindings/$(DEPDIR)/module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/dbus_py_test.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +test/test_test_import_repeatedly-import-repeatedly.o: test/import-repeatedly.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_import_repeatedly_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_test_import_repeatedly-import-repeatedly.o -MD -MP -MF test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Tpo -c -o test/test_test_import_repeatedly-import-repeatedly.o `test -f 'test/import-repeatedly.c' || echo '$(srcdir)/'`test/import-repeatedly.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Tpo test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/import-repeatedly.c' object='test/test_test_import_repeatedly-import-repeatedly.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_import_repeatedly_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_test_import_repeatedly-import-repeatedly.o `test -f 'test/import-repeatedly.c' || echo '$(srcdir)/'`test/import-repeatedly.c + +test/test_test_import_repeatedly-import-repeatedly.obj: test/import-repeatedly.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_import_repeatedly_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_test_import_repeatedly-import-repeatedly.obj -MD -MP -MF test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Tpo -c -o test/test_test_import_repeatedly-import-repeatedly.obj `if test -f 'test/import-repeatedly.c'; then $(CYGPATH_W) 'test/import-repeatedly.c'; else $(CYGPATH_W) '$(srcdir)/test/import-repeatedly.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Tpo test/$(DEPDIR)/test_test_import_repeatedly-import-repeatedly.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test/import-repeatedly.c' object='test/test_test_import_repeatedly-import-repeatedly.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_test_import_repeatedly_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_test_import_repeatedly-import-repeatedly.obj `if test -f 'test/import-repeatedly.c'; then $(CYGPATH_W) 'test/import-repeatedly.c'; else $(CYGPATH_W) '$(srcdir)/test/import-repeatedly.c'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + -rm -rf _dbus_bindings/.libs _dbus_bindings/_libs + -rm -rf _dbus_glib_bindings/.libs _dbus_glib_bindings/_libs + -rm -rf test/.libs test/_libs + +distclean-libtool: + -rm -f libtool config.lt +install-nobase_dist_installed_testPYTHON: $(nobase_dist_installed_test_PYTHON) + @$(NORMAL_INSTALL) + @list='$(nobase_dist_installed_test_PYTHON)'; test -n "$(installed_testdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ + fi; \ + $(am__nobase_list) | { while read dir files; do \ + xfiles=; for p in $$files; do \ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f "$$b$$p"; then xfiles="$$xfiles $$b$$p"; dlist="$$dlist $$p"; \ + else :; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo "$(MKDIR_P) '$(DESTDIR)$(installed_testdir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)/$$dir"; }; \ + echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(installed_testdir)/$$dir'"; \ + $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(installed_testdir)/$$dir" || exit $$?; }; \ + done; \ + if test -n "$$dlist"; then \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(installed_testdir)" $$dlist; \ + else :; fi; } + +uninstall-nobase_dist_installed_testPYTHON: + @$(NORMAL_UNINSTALL) + @list='$(nobase_dist_installed_test_PYTHON)'; test -n "$(installed_testdir)" || list=; \ + $(am__nobase_strip_setup); py_files=`$(am__nobase_strip)`; \ + test -n "$$py_files" || exit 0; \ + dir='$(DESTDIR)$(installed_testdir)'; \ + pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ + pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ + st=0; \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ + exit $$st +install-nobase_pythonPYTHON: $(nobase_python_PYTHON) + @$(NORMAL_INSTALL) + @list='$(nobase_python_PYTHON)'; test -n "$(pythondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \ + fi; \ + $(am__nobase_list) | { while read dir files; do \ + xfiles=; for p in $$files; do \ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f "$$b$$p"; then xfiles="$$xfiles $$b$$p"; dlist="$$dlist $$p"; \ + else :; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo "$(MKDIR_P) '$(DESTDIR)$(pythondir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(pythondir)/$$dir"; }; \ + echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pythondir)/$$dir'"; \ + $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pythondir)/$$dir" || exit $$?; }; \ + done; \ + if test -n "$$dlist"; then \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(pythondir)" $$dlist; \ + else :; fi; } + +uninstall-nobase_pythonPYTHON: + @$(NORMAL_UNINSTALL) + @list='$(nobase_python_PYTHON)'; test -n "$(pythondir)" || list=; \ + $(am__nobase_strip_setup); py_files=`$(am__nobase_strip)`; \ + test -n "$$py_files" || exit 0; \ + dir='$(DESTDIR)$(pythondir)'; \ + pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ + pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ + st=0; \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ + exit $$st +install-dist_docDATA: $(dist_doc_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ + done + +uninstall-dist_docDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) +install-installed_test_metaDATA: $(installed_test_meta_DATA) + @$(NORMAL_INSTALL) + @list='$(installed_test_meta_DATA)'; test -n "$(installed_test_metadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_test_metadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_test_metadir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(installed_test_metadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(installed_test_metadir)" || exit $$?; \ + done + +uninstall-installed_test_metaDATA: + @$(NORMAL_UNINSTALL) + @list='$(installed_test_meta_DATA)'; test -n "$(installed_test_metadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(installed_test_metadir)'; $(am__uninstall_files_from_dir) +install-installed_test_testDATA: $(installed_test_test_DATA) + @$(NORMAL_INSTALL) + @list='$(installed_test_test_DATA)'; test -n "$(installed_test_testdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_test_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_test_testdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(installed_test_testdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(installed_test_testdir)" || exit $$?; \ + done + +uninstall-installed_test_testDATA: + @$(NORMAL_UNINSTALL) + @list='$(installed_test_test_DATA)'; test -n "$(installed_test_testdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(installed_test_testdir)'; $(am__uninstall_files_from_dir) +install-nodist_docDATA: $(nodist_doc_DATA) + @$(NORMAL_INSTALL) + @list='$(nodist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ + done + +uninstall-nodist_docDATA: + @$(NORMAL_UNINSTALL) + @list='$(nodist_doc_DATA)'; test -n "$(docdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) +install-dbusincludeHEADERS: $(dbusinclude_HEADERS) + @$(NORMAL_INSTALL) + @list='$(dbusinclude_HEADERS)'; test -n "$(dbusincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbusincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbusincludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(dbusincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(dbusincludedir)" || exit $$?; \ + done + +uninstall-dbusincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(dbusinclude_HEADERS)'; test -n "$(dbusincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(dbusincludedir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test/test-import-repeatedly.log: test/test-import-repeatedly$(EXEEXT) + @p='test/test-import-repeatedly$(EXEEXT)'; \ + b='test/test-import-repeatedly'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.sh.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.sh$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +.py.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(PY_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_PY_LOG_DRIVER_FLAGS) $(PY_LOG_DRIVER_FLAGS) -- $(PY_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.py$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(PY_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_PY_LOG_DRIVER_FLAGS) $(PY_LOG_DRIVER_FLAGS) -- $(PY_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__post_remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ + $(HEADERS) config.h +installdirs: + for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_test_testdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(dbusincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f _dbus_bindings/$(DEPDIR)/$(am__dirstamp) + -rm -f _dbus_bindings/$(am__dirstamp) + -rm -f _dbus_glib_bindings/$(DEPDIR)/$(am__dirstamp) + -rm -f _dbus_glib_bindings/$(am__dirstamp) + -rm -f test/$(DEPDIR)/$(am__dirstamp) + -rm -f test/$(am__dirstamp) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +@ENABLE_API_DOCS_FALSE@clean-local: +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local \ + clean-nobase_installed_testLTLIBRARIES \ + clean-nobase_installed_testPROGRAMS clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS clean-pyexecLTLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf _dbus_bindings/$(DEPDIR) _dbus_glib_bindings/$(DEPDIR) test/$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dbusincludeHEADERS install-dist_docDATA \ + install-installed_test_metaDATA \ + install-installed_test_testDATA \ + install-nobase_dist_installed_testPYTHON \ + install-nobase_dist_installed_testSCRIPTS \ + install-nobase_installed_testLTLIBRARIES \ + install-nobase_installed_testPROGRAMS \ + install-nobase_pythonPYTHON install-nodist_docDATA \ + install-pkgconfigDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pyexecLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf _dbus_bindings/$(DEPDIR) _dbus_glib_bindings/$(DEPDIR) test/$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dbusincludeHEADERS uninstall-dist_docDATA \ + uninstall-installed_test_metaDATA \ + uninstall-installed_test_testDATA \ + uninstall-nobase_dist_installed_testPYTHON \ + uninstall-nobase_dist_installed_testSCRIPTS \ + uninstall-nobase_installed_testLTLIBRARIES \ + uninstall-nobase_installed_testPROGRAMS \ + uninstall-nobase_pythonPYTHON uninstall-nodist_docDATA \ + uninstall-pkgconfigDATA uninstall-pyexecLTLIBRARIES + +.MAKE: all check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-TESTS \ + check-am check-local clean clean-cscope clean-generic \ + clean-libtool clean-local \ + clean-nobase_installed_testLTLIBRARIES \ + clean-nobase_installed_testPROGRAMS clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS clean-pyexecLTLIBRARIES cscope \ + cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dbusincludeHEADERS \ + install-dist_docDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-installed_test_metaDATA \ + install-installed_test_testDATA install-man \ + install-nobase_dist_installed_testPYTHON \ + install-nobase_dist_installed_testSCRIPTS \ + install-nobase_installed_testLTLIBRARIES \ + install-nobase_installed_testPROGRAMS \ + install-nobase_pythonPYTHON install-nodist_docDATA install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-pyexecLTLIBRARIES install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ + uninstall-dbusincludeHEADERS uninstall-dist_docDATA \ + uninstall-installed_test_metaDATA \ + uninstall-installed_test_testDATA \ + uninstall-nobase_dist_installed_testPYTHON \ + uninstall-nobase_dist_installed_testSCRIPTS \ + uninstall-nobase_installed_testLTLIBRARIES \ + uninstall-nobase_installed_testPROGRAMS \ + uninstall-nobase_pythonPYTHON uninstall-nodist_docDATA \ + uninstall-pkgconfigDATA uninstall-pyexecLTLIBRARIES + +.PRECIOUS: Makefile + + tools/ci-build.sh \ + $(NULL) +check-local:: + @fail=0; \ + cd $(srcdir) || exit $$?; \ + if test -n "$(check_misc_sources)"; then \ + echo check-coding-style.mk: checking misc sources...; \ + top_srcdir=$(abs_top_srcdir) \ + sh $(abs_top_srcdir)/tools/check-whitespace.sh \ + $(check_misc_sources) || fail=1; \ + fi; \ + if test -n "$(check_py_sources)"; then \ + echo check-coding-style.mk: checking Python sources...; \ + top_srcdir=$(abs_top_srcdir) \ + sh $(abs_top_srcdir)/tools/check-py-style.sh \ + $(check_py_sources) || fail=1; \ + fi;\ + if test -n "$(check_c_sources)"; then \ + echo check-coding-style.mk: checking C sources...; \ + top_srcdir=$(abs_top_srcdir) \ + sh $(abs_top_srcdir)/tools/check-c-style.sh \ + $(check_c_sources) || fail=1; \ + fi;\ + if test yes = "@ENABLE_CODING_STYLE_CHECKS@"; then \ + exit "$$fail";\ + else \ + exit 0;\ + fi + +# === Tests === + +cross-test-compile: all + +cross-test-server: + $(AM_TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-server.py +cross-test-client: + $(AM_TESTS_ENVIRONMENT) $(PYTHON) $(top_srcdir)/test/cross-test-client.py + +$(noinst_DATA): test/%: test/%.in + @$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) \ + -e 's|[@]PYTHON[@]|$(PYTHON)|g' \ + -e 's|[@]G_TEST_SRCDIR[@]|$(abs_top_srcdir)|g' \ + -e 's|[@]G_TEST_BUILDDIR[@]|$(abs_top_builddir)|g' \ + $< > $@ + +$(installed_test_test_data): test/installable/%: test/%.in + @$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) \ + -e 's|[@]PYTHON[@]|$(PYTHON)|g' \ + -e 's|[@]G_TEST_SRCDIR[@]|$(installed_testdir)|g' \ + -e 's|[@]G_TEST_BUILDDIR[@]|$(installed_testdir)|g' \ + $< > $@ + +$(patsubst %,%.test,$(dist_test_py)): %.test: Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_log_compiler) $(PYTHON) $(installed_testdir)/$*' >> $@.tmp; \ + mv $@.tmp $@) + +$(patsubst %,%.test,$(dist_test_sh)): %.test: Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_log_compiler) $(installed_testdir)/$*' >> $@.tmp; \ + mv $@.tmp $@) + +$(patsubst %,%.test,$(test_programs)): %.test: Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(installed_log_compiler) $(installed_testdir)/$*$(EXEEXT)' >> $@.tmp; \ + mv $@.tmp $@) + +# === Documentation === + +@GENERATE_CHANGELOG_RULES@ + +dist-hook: dist-ChangeLog + echo $(VERSION) > $(distdir)/.version + touch $(distdir)/MANIFEST + touch $(distdir)/MANIFEST.in + ( cd $(distdir) && find -type d -o -print ) | \ + LC_ALL=C sort | \ + $(SED) -e 's|^\./||' \ + > $(distdir)/MANIFEST + sed -e 's/.*/include &/' < $(distdir)/MANIFEST > $(distdir)/MANIFEST.in + +maintainer-upload: + rsync -tvpP --chmod=ugo=r $(DIST_ARCHIVES) $(DIST_ARCHIVES:%=%.asc) \ + dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus-python/ + +maintainer-update-website: _maintainer-update-apidocs \ + _maintainer-update-htmldocs + +@ENABLE_DOCS_TRUE@_maintainer-update-htmldocs: $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS) +@ENABLE_DOCS_TRUE@ rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc \ +@ENABLE_DOCS_TRUE@ $(patsubst %,$(srcdir)/%,$(RSTDOCS)) $(HTML_RSTDOCS) \ +@ENABLE_DOCS_TRUE@ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/ + +@ENABLE_DOCS_TRUE@$(HTML_TXT_RSTDOCS) : %.html: %.txt +@ENABLE_DOCS_TRUE@ $(INSTALL) -d doc +@ENABLE_DOCS_TRUE@ $(RST2HTML) $(RST2HTMLFLAGS) $< $@ +@ENABLE_DOCS_TRUE@$(HTML_RSTDOCS) : %.html: % +@ENABLE_DOCS_TRUE@ $(RST2HTML) $(RST2HTMLFLAGS) $< $@ +@ENABLE_DOCS_FALSE@_maintainer-update-htmldocs: +@ENABLE_DOCS_FALSE@ @echo "*** Not updating the HTML docs on the website - install rst2html" +@ENABLE_DOCS_FALSE@ @echo "*** from http://docutils.sourceforge.net/ and configure with " +@ENABLE_DOCS_FALSE@ @echo "*** --enable-html-docs" + +@ENABLE_API_DOCS_TRUE@all: api/index.html + +@ENABLE_API_DOCS_TRUE@clean-local: +@ENABLE_API_DOCS_TRUE@ rm -rf api + +@ENABLE_API_DOCS_TRUE@api api/index.html: $(nobase_python_PYTHON) \ +@ENABLE_API_DOCS_TRUE@ _dbus_bindings.la \ +@ENABLE_API_DOCS_TRUE@ _dbus_glib_bindings.la +@ENABLE_API_DOCS_TRUE@ rm -rf api +@ENABLE_API_DOCS_TRUE@ mkdir api +@ENABLE_API_DOCS_TRUE@ cd $(abs_top_srcdir) && \ +@ENABLE_API_DOCS_TRUE@ PYTHONPATH=$(APIDOC_PYTHONPATH) DBUS_PYTHON_NO_DEPRECATED=1 \ +@ENABLE_API_DOCS_TRUE@ $(PYTHON) -Wignore::DeprecationWarning \ +@ENABLE_API_DOCS_TRUE@ $(EPYDOC) -o $(abs_top_builddir)/api --html \ +@ENABLE_API_DOCS_TRUE@ --docformat restructuredtext -v \ +@ENABLE_API_DOCS_TRUE@ `find dbus -name '*.py' \ +@ENABLE_API_DOCS_TRUE@ | sed -e 's#/__init__\.py##g' \ +@ENABLE_API_DOCS_TRUE@ -e 's/\.py\>//g' -e 's#/#.#'g` \ +@ENABLE_API_DOCS_TRUE@ || { rm -rf api; exit 1; } + +@ENABLE_API_DOCS_TRUE@_maintainer-update-apidocs: api +@ENABLE_API_DOCS_TRUE@ rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX api/ \ +@ENABLE_API_DOCS_TRUE@ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/api/ +@ENABLE_API_DOCS_FALSE@_maintainer-update-apidocs: +@ENABLE_API_DOCS_FALSE@ @echo "*** Not updating the API docs on the website - install epydoc 3" +@ENABLE_API_DOCS_FALSE@ @echo "*** alpha (or newer) and configure with --enable-api-docs" +check-local:: + @fail=0; \ + cd $(srcdir) || exit $$?; \ + if test -n "$(check_misc_sources)"; then \ + echo check-coding-style.mk: checking misc sources...; \ + top_srcdir=$(abs_top_srcdir) \ + sh $(abs_top_srcdir)/tools/check-whitespace.sh \ + $(check_misc_sources) || fail=1; \ + fi; \ + if test -n "$(check_py_sources)"; then \ + echo check-coding-style.mk: checking Python sources...; \ + top_srcdir=$(abs_top_srcdir) \ + sh $(abs_top_srcdir)/tools/check-py-style.sh \ + $(check_py_sources) || fail=1; \ + fi;\ + if test -n "$(check_c_sources)"; then \ + echo check-coding-style.mk: checking C sources...; \ + top_srcdir=$(abs_top_srcdir) \ + sh $(abs_top_srcdir)/tools/check-c-style.sh \ + $(check_c_sources) || fail=1; \ + fi;\ + if test yes = "@ENABLE_CODING_STYLE_CHECKS@"; then \ + exit "$$fail";\ + else \ + exit 0;\ + fi + +.PHONY: cross-test-compile cross-test-server cross-test-client \ + always-rebuild maintainer-update-website \ + _maintainer-update-apidocs _maintainer-update-htmldocs \ + maintainer-upload + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..d489d90 --- /dev/null +++ b/NEWS @@ -0,0 +1,630 @@ +D-Bus Python Bindings 1.2.4 (2016-03-06) +======================================== + +The “75,000 microchips” release. + +Enhancements: + +• Continous integration metadata for travis-ci.org is now available. + Similar to dbus, this is split into .travis.yml (Travis-specifics) + and tools/ci-build.sh (intended to be useful for any CI framework, + although it does include various workarounds for travis-ci oddities). + (Simon McVittie) + +Fixes: + +• Make dbus.version a tuple again, not a list, for consistent sorting. + This was a regression in 1.2.2. (Debian #816729, Simon McVittie) + +• Use inspect.signature() instead of inspect.getargspec() on Python + versions that have it. inspect.getargspec() is deprecated in recent + Python 3 and seems to have disappeared from 3.6 nightly builds. + (Simon McVittie) + +• Make the tests pass in "narrow" Python builds where unicode objects + are UTF-16, rather than the UCS-4 used in Linux distributions. + (fd.o #57140, Simon McVittie) + +• Always include headers in a consistent order (Debian #749133, Simon McVittie) + +• Include config.h in all C code that we compile. This is necessary + on platforms where it might contain something like "#define _GNU_SOURCE" + or "#define inline __inline". + (Simon McVittie) + +D-Bus Python Bindings 1.2.2 (2016-02-22) +======================================== + +The “mind fray” release. + +Versioning changes: + +• dbus-python releases now have an even micro version (1.2.0, 1.2.2), + and snapshots from git have an odd micro version (1.2.1). + +Dependencies: + +• Building from git (but not from tarballs) now requires + macros from the GNU Autoconf Archive, for example the autoconf-archive + package in Debian or Fedora derivatives. + +• Building from git (but not from tarballs) now requires Automake 1.13 + or later. + +• The automated tests and some examples now require PyGI (the gi module), + not PyGObject 2 (the deprecated glib and gobject modules). + +Enhancements: + +• There is now a setuptools setup.py, allowing dbus-python to be installed + into a virtualenv using pip from a standard Automake source release. This + requires pre-existing system-wide installations of the normal build + dependencies (pkg-config, libdbus, dbus-glib, a C compiler) and has + some limitations. For system-wide installations and development, + please use the Autoconf/Automake build system directly. + (fd.o #55439; Simon McVittie) + +• dbus-python now uses the common compiler warnings from AX_COMPILER_FLAGS + (Simon McVittie) + +• The automated tests can now be installed as GNOME-style "installed tests", + and should be somewhat more reliable (Simon McVittie) + +Fixes: + +• ``from dbus.service import *`` now imports FallbackObject + (fd.o #85720; Ben Longbons) + +• The GConf-related examples work again (fd.o #85720; Ben Longbons) + +• Consistently make examples executable, and install them all + (fd.o #85720; Ben Longbons) + +• Search PATH for an appropriately-versioned pythonX.Y-config, or as a last + resort python-config, if there isn't a ${PYTHON}-config in the + same directory as ${PYTHON} (fd.o #92085; Yamashita, Yuu) + +• Add support for the Automake 1.13 parallel test driver (Simon McVittie) + +• Skip building API documentation if "import epydoc" fails (Simon McVittie) + +D-Bus Python Bindings 1.2.0 (2013-05-07) +======================================== + +The "compile like it's 1998" release. + +Dependencies: + +• libdbus 1.6 or later is now required. + +Enhancements: + +• Unicode Corrigendum 9: when used with a suitable version of libdbus + (1.6.10 or later, or 1.7.2 or later), noncharacters in strings are + now accepted + +Fixes: + +• Support DBusException('something with non—ASCII') under Python 2 + (Michael Vogt, smcv; fd.o #55899) + +• Correct some misleading wording in COPYING which was written under the + assumption that libdbus could actually be relicensed to MIT/X11 + (Thiago Macieira) + +• Avoid variable-length arrays, because MSVC++ is still stuck in 1998 + (based on patches from Christoph Höger, fd.o #51725) + +• Remove unnecessary uses of stdint.h (fd.o #51725) + +• Add support for Unix compilers not supporting 'inline', for completeness + +• Use GObject.__class__ instead of GObjectMeta, which can no longer be + imported from gi.repository.GObject in pygobject 3.8 + +• Fix autoreconfiscation on Automake 1.13 (Marko Lindqvist, fd.o #59006) + +D-Bus Python Bindings 1.1.1 (2012-06-25) +======================================== + +The "Lemonade Sky" release. + +Dependencies: + +• libdbus 1.6 or later is now recommended. It is not strictly required yet. + +Fixes: + +• Validate UTF-8 according to the rules libdbus uses, falling back to our + own (inefficient) implementation if not compiled against dbus >= 1.6 + (fd.o #40817) + +• Under Python 3, in the absence of introspection or signature='...', + pass dbus.ObjectPath or dbus.Signature arguments with the obvious + signature 'o' or 'g', not 's'. This previously only worked in Python 2. + (fd.o #50740) + +D-Bus Python Bindings 1.1.0 (2012-05-09) +======================================== + +The “eaten by spiders” release. + +Deprecations: + +• dbus.gobject_service is deprecated. Use dbus.gi_service and PyGI in new code. + +API changes: + +• dbus.gobject_service works in legacy PyGObject 2 applications again, + like it did before 1.0. The down side is that it doesn't work in all PyGI + applications any more, unlike 1.0. In PyGI applications, depend on + dbus-python >= 1.1 and use dbus.gi_service instead - its API is the same. + (fd.o #48904, Debian #670516) + +• dbus.gobject_service has been removed from Python 3 builds altogether. + +Enhancements: + +• Use DBusBasicValue from libdbus 1.5, if available, rather than reinventing it + +Fixes: + +• Put sockets for the regression tests in /tmp, not the builddir, fixing + test failures in a really long builddir (fd.o #46747) + +• Fix a reference leak in dbus_py_variant_level_set (fd.o #47108) + +• Modify AM_CHECK_PYTHON_HEADERS so the "another way" works with Python 3 + +D-Bus Python Bindings 1.0.0 (2012-01-24) +======================================== + +The "never trust a .0 release?" release. + +Dependencies: + +* libdbus 1.4 or later is now required. + +* Python 2.6 or later is now required. If Python 3 is used, it must be + version 3.2 or later. + +* GNU make (or, at your own risk, another make with the GNU $(patsubst) + extension) is now required. + +API changes: + +* dbus_bindings, which was never meant to be public API and has been + deprecated for nearly 5 years, has finally been removed. + +* The repr() of every dbus-python object is now unicode. + +* The Python 3 API is not the same as the Python 2 API; see PY3PORT.rst + for details. + +• dbus.gobject_service uses PyGI, not PyGObject. (This was not meant to be + an incompatible change, but unfortunately, it was. It was reverted in 1.1.0.) + +Enhancements: + +* Python 3 compatibility (fd.o #26420, Barry Warsaw) + +* MethodCallMessage and SignalMessage now have a more useful repr() + (Barry Warsaw) + +Fixes: + +* OOM while appending a unicode object to a message no longer leaks a string + (Barry Warsaw) + +* If libdbus somehow gives us invalid UTF-8, don't crash (Barry Warsaw) + +* Fix rst2html failure in non-UTF-8 locales (Alexandre Rostovtsev) + +D-Bus Python Bindings 0.84.0 (2011-05-25) +========================================= + +The "Comrade Bill Bartram's Egalitarian Anti-Imperialist Soviet Stout" release. + +Enhancements: + +* fd.o #30812: add the UnixFd type, and support Unix fd passing if + compiled against a new enough libdbus (Elvis Pfützenreuter) + +* fd.o #34342: add Connection.set_allow_anonymous(bool) (Scott Tsai) + +* fd.o #21017: add configure arguments PYTHON_INCLUDES and PYTHON_LIBS which + can be used to override $PYTHON-config (Simon McVittie, based on a patch from + Robert Schwebel) + +Fixes: + +* fd.o #35626: clear ProxyObject's pending introspection queue after + execution (Scott Tsai) + +* fd.o #22560: remove duplicate code from example-async-client (Simon McVittie) + +* fd.o #36206: allow signature='x' among ProxyObject method arguments + (Simon McVittie) + +D-Bus Python Bindings 0.83.2 (2010-12-02) +========================================= + +Dependencies: + +* libdbus 1.2 is still supported, but libdbus >= 1.4 is recommended. + +Fixes: + +* Make BusConnection.list_activatable_names actually call ListActivatableNames, + not ListNames (Johan Sandelin) + +* Don't override CFLAGS when adding compiler warnings + (Louis-Francis Ratté-Boulianne) + +* Fix compilation on platforms where Py_ssize_t is larger than int, like x86-64 + (Elvis Pfützenreuter) + +* fd.o #21831: deserialize empty byte arrays with byte_arrays=True as + ByteArray(''), not ByteArray('None') (Simon McVittie) + +* fd.o #23278, #25105: fix crashes when trying to append more struct entries + than the signature allows with libdbus 1.4 (Simon McVittie) + +* fd.o #23831: fix crashes when an embedded Python interpreter imports dbus, + is finalized, is re-initialized, and re-imports dbus (Simon McVittie) + +D-Bus Python Bindings 0.83.1 (2010-02-18) +========================================= + +Fixes: + +* fd.o #21172: avoid some deprecation warnings in Python 2.6 + +* fd.o #15013: add dbus.lowlevel.MESSAGE_TYPE_SIGNAL etc., for those who care + about message types at a low level + +* When removing signal matches, clean up internal state, avoiding a memory + leak in long-lived Python processes that connect to signals from arbitrarily + many object paths (fd.o #17551, thanks to Marco Pesenti Gritti) + +* When setting the sender of a message, allow it to be org.freedesktop.DBus + so you can implement a D-Bus daemon in pure Python (patch from Huang Peng) + +D-Bus Python Bindings 0.83.0 (2008-07-23) +========================================= + +Features: + +* Add bindings for DBusServer (thanks to Mathias Hasselmann, Huang Peng; + fd.o #14322, #15514). + +* Omit the service's traceback from certain D-Bus errors: specifically, those + that were probably deliberately raised as part of an API. Subclasses + of DBusException that indicate programmer error can turn the traceback + back on if it seems likely to be useful. + +Fixes: + +* Don't emit spurious Error messages if libdbus gives object-path handlers + a message that isn't a method call (most likely because of binding to a + locally emitted signal, as in fd.o #14199). + +* Make multiple filters added by Connection.add_message_filter work + (fd.o #15547, thanks to Huang Peng). + +* Make the API docs build correctly when out-of-tree + +* Require dbus 1.0 so we can get rid of DBUS_API_SUBJECT_TO_CHANGE + +D-Bus Python Bindings 0.82.4 (2007-12-10) +========================================= + +Fixes: + +* supplying reply_handler but not error_handler raises + MissingReplyHandlerException instead of MissingErrorHandlerException, + and vice versa (fd.o #12304, patch from René Neumann) +* Using non-recursive make for dbus/ directory should fix builds in some + environments (fd.o #12741) + +Licensing: + +* Everything is now under the same MIT/X11 license used for Collabora code in + the previous release +* Added copyright headers to some files that were still missing them + +D-Bus Python Bindings 0.82.3 (2007-09-27) +========================================= + +Fixes: + +* Out-of-tree builds with an absolute $(srcdir) can now build docs and run tests +* Closing private dbus.Bus no longer raises KeyError (fd.o #12096) +* async_err_cb(MyException()) now works (fd.o #12403) +* dbus.service.Object.remove_from_connection no longer claims that multiple + exports aren't possible (fd.o #12432) +* Setting _dbus_error_name as a class attribute of DBusException subclasses + works again + +Deprecations: + +* dbus.Bus(private=True) (use dbus.bus.BusConnection in new code, dbus.Bus + basically just adds the shared-connection behaviour) + +Licensing: + +* Code for which Collabora is the only copyright holder is now under the + same permissive MIT/X11 license under which dbus core is being relicensed + (this allows everything the old license would have allowed, and more) + +D-Bus Python Bindings 0.82.2 (2007-08-01) +========================================= + +Incompatibility with 0.82.1: + +* If you pass the timeout argument to call_async or an asynchronous proxy + method call and expect it to be in milliseconds, you should change the + argument to be in seconds, and require dbus-python >= 0.82.2. + + This feature didn't work at all in versions prior to 0.82.1, so any code + that works with 0.82.0 or earlier is unaffected. + +Features: + +* @dbus.service.method supports a rel_path_keyword argument for the benefit + of fallback objects, which provides the method implementation with the path + of the object within the exported subtree. For instance, if you have a + fallback object exported at /Fallback, and you call a method that has + rel_path_keyword='rel_path' on /Fallback and on /Fallback/Some/Where, the + method implementation will be called with rel_path='/' and with + rel_path='/Some/Where' respectively. (fd.o #11623) + +* If you have epydoc version 3 (currently in beta), API documention is now + generated by default. + +Fixes: + +* As mentioned under "Incompatibilities" above, Connection.call_async() + measures timeouts in seconds, as was always intended. + This means that calls through a proxy object with a reply_handler and + error_handler will measure the timeout in seconds too. + +* Introspect() now works on objects exported in more than one location. + (fd.o #11794) + +* Building against Python 2.4 on non-Debian-derived distributions, or a + non-default Python version on Gentoo, should work again (revenge + of fd.o #11282, thanks Eyal Ben David). + +D-Bus Python Bindings 0.82.1 (2007-07-11) +========================================= + +The "double precision" release. + +Fixes: + +* Parse the timeout correctly in send_message_with_reply() and + send_message_with_reply_and_block(), fixing the use of non-default timeouts + (bugs.fd.o #11489) +* The tutorial no longer uses interactive-Python syntax, as it confused users. + (bugs.fd.o #11209) +* When making a call via a proxy object with ignore_reply=True, also get the + necessary introspection data asynchronously. This can avoid deadlocks in + some cases, such as calling methods in the same process (though this is not + recommended, for efficiency and sanity reasons). +* dbus.lowlevel exposes enough constants to write correct filter functions. +* We don't use dbus_watch_get_fd() (deprecated in libdbus) unless our libdbus + is too old to have the modern replacement, dbus_watch_get_unix_fd(). + +Deprecations: + +* Omitting the bus argument in the BusName constructor is deprecated. + The fact that it uses the globally shared connection to the session bus by + default is uncomfortably subtle. + +D-Bus Python Bindings 0.82.0 (2007-06-19) +========================================= + +Features: + +* dbus.service.Object can start off with no Connection or object path, and + become exported later. If suitable class attributes are set, objects can + even be exported on multiple connections, or with multiple object-paths, + or both. + +* dbus.service.FallbackObject implements a whole subtree of object-path space + (fd.o #9295). + +* ``@method`` accepts a parameter ``connection_keyword`` so methods can find + out which connection to use for any follow-up actions. + +* ``@signal`` has a new parameter ``rel_path_keyword`` which gets the path at + which to emit the signal, relative to the path of the FallbackObject. + ``path_keyword`` is now deprecated, and will raise an exception if used + on an object with ``SUPPORTS_MULTIPLE_OBJECT_PATHS``, including any + ``FallbackObject``. + +Fixes: + +* In watch_name_owner, only the desired name is watched! + +* When cleaning up signal matches, errors are ignored. This avoids using up + scarce pending-call allowance on dbus-daemon < 1.1, and emitting error + messages if we get disconnected. + +* Signal handlers which are bound to a unique name are automatically + disconnected when the unique name goes away, reducing the likelihood that + applications will leak signal matches. + +* Some corrections were made to the tutorial (@service and @method take a + parameter dbus_interface, not just interface; fd.o #11209). + +* ${PYTHON}-config is used to get the Python include path (patch from + Sebastien Bacher/Ubuntu, fd.o #11282). + +D-Bus Python Bindings 0.81.1 (4 June 2007) +========================================== + +Features: + +* When an Error message on the bus is represented as a DBusException, the + error name is copied into the exception and can be retrieved by + get_dbus_name(). Exception handlers should use this instead of looking at + the stringified form of the exception, unless backwards compatibility + is needed. +* DBusException objects now get all arguments from the Error message, not + just the first (although there will usually only be one). Use the 'args' + attribute if you need to retrieve them. +* The Connection, BusConnection and Bus classes have a method + list_exported_child_objects(path: str) -> list of str, which wraps + dbus_connection_list_registered() +* You can remove objects from D-Bus before they become unreferenced, by + using dbus.service.Object.remove_from_connection() + (https://bugs.freedesktop.org/show_bug.cgi?id=10457) + +Bug fixes: + +* Don't deadlock when removing a signal match that tracks name-owner changes. + (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=426412) +* Include child nodes in introspection using list_exported_child_objects() + +D-Bus Python Bindings 0.81.0 (9 May 2007) +========================================= + +The 'series of tubes' release +----------------------------- + +This is a feature release with support for non-bus-daemon connections +and improved GObject integration. + +Features: + +* Bus has a superclass dbus.bus.BusConnection (a connection to a bus daemon, + but without the shared-connection semantics or any deprecated API) + for the benefit of those wanting to subclass bus daemon connections + +* BusConnection has a superclass dbus.connection.Connection (a + connection without a bus daemon) for use in peer-to-peer situations, + or distributed pseudo-bus situations without a bus daemon such as + Telepathy's Tubes API + +* dbus.gobject_service.ExportedGObject is like dbus.service.Object, but + is also a subclass of GObject (with the necessary metaclass magic to + make this work). Until someone has verified that the GObject side of + things works as expected too, I consider this API to be potentially + subject to change! + +* Connection and BusConnection have gained a number of useful methods, + including watch_name_owner (track name owner changes asynchronously, + avoiding race conditions), call_blocking and call_async (blocking and + asynchronous method calls without going via a proxy - note that these + are semi-low-level interfaces which don't do introspection), and + list_names, list_activatable_names and get_name_owner which are + simple wrappers for the corresponding org.freedesktop.DBus methods + +* dbus.Interface (now also available at dbus.proxies.Interface) + and dbus.proxies.ProxyObject now have some reasonably obvious properties. + +Deprecations: + +* All keyword arguments called named_service are deprecated in favour of an + argument called bus_name (to be compatible with both older and newer + dbus-python, you should pass these positional arguments). + +* The bus keyword argument to dbus.proxies.ProxyObject is deprecated in + favour of an argument called conn, because proxies will work on non-bus + connections now (again, for maximum compatibility you should use a + positional argument for this). + +* No warning is raised for this, but I consider calling any remote method + on a ProxyObject or Interface whose name is either alllowercase or + lower_case_with_underscores to be deprecated, and reserve the right + to add properties or methods of this form in future releases - use + ProxyObject.get_dbus_method if you must call a remote method named in + this way. Methods named following TheUsualDBusConvention or + theJavaConvention are safe. + +Bugfixes: + +* Exceptions in signal handlers print a stack trace to stderr (this can + be redirected elsewhere with Python's logging framework). Partially + addresses fd.o #9980. + +* The reserved local interface and object path are properly checked for. + +* When you return a tuple that is not a Struct from a method with no + out_signature, it's interpreted as multiple return values, not a + single Struct (closes fd.o #10174). + +* If send_with_reply() returns TRUE but with pending call NULL, dbus-python + no longer crashes. This can happen when unexpectedly disconnected. + +* Arguments are not examined for functions declared METH_NOARGS (this is + unnecessary and can cause a crash). + +Other notable changes: + +* dbus-python uses the standard Python logging framework throughout. + The first time a WARNING or ERROR is generated, it will configure the + logging framework to output to stderr, unless you have already + configured logging in your application. + +* The tutorial now advocates the use of add_signal_receiver if all you + want to do is listen for signals: this avoids undesired activation, + e.g. of Listen or Rhythmbox (!). Addresses fd.o #10743, fd.o #10568. + +D-Bus Python Bindings 0.80.2 (13 February 2007) +=============================================== +- Fix numerous memory and reference leaks +- Only use -Werror if the user specifically asks for it +- Audit tp_dealloc callbacks to make sure they correctly preserve the + exception state +- Relicense files solely owned by Collabora Ltd. more permissively (LGPL/AFL + rather than GPL/AFL) - this includes the tutorial and all the C code + +D-Bus Python Bindings 0.80.1 (24 January 2007) +============================================== +- The "oops" release +- Install dbus/_version.py, so dbus.__version__ exists again + +D-Bus Python Bindings 0.80.0 (24 January 2007) +============================================== +- The "everything changes" release +- Rewrite dbus_bindings (Pyrex) as _dbus_bindings (C) - API changes! +- Define what's public API +- Move low-level but still public API to dbus.lowlevel +- Remove Variant class, add variant_level property on all D-Bus types +- Make signal matching keep working as expected when name ownership changes +- Use unambiguous D-Bus types when transferring from D-Bus to Python +- Follow well-defined rules when transferring from Python to D-Bus +- Add utf8_strings and byte_arrays options in various places, so a user + can tweak the calling conventions to be more efficient +- Raise RuntimeError if user tries to use a connection with no main loop + to do something that won't work without one +- Make asynchronous method calls actually asynchronous when made before + introspection results come back +- Redo main loop machinery so we can add pure-Python main loops later without + API breakage +- Allow construction of a dbus.service.Object if you don't have a BusName + (or even a Bus) +- Port introspection XML parser from libxml2 (external package) to expat + (included with Python) +- Port build system from distutils to autoconf/automake/libtool +- Install a header file for third-party main loop integration +- Make compatible with Python 2.5, including on 64-bit platforms +- Add docstrings throughout +- Add more tests and examples +- Add interoperability tests (which interoperate with Java) +- Add copyright notices! + +D-Bus Python Bindings 0.71 (24 July 2006) +============================================================== +- Binary modules are now installed in the correct directory +- Distutils exports the dbus and dbus-glib cflags + +D-Bus Python Bindings 0.70 (17 July 2006) +============================================================== +- First release of bindings split +- Move to a distutils build enviornment +- It is possible to now specify sender_keyword="foo", path_keyword="bar" when + adding a signal listener diff --git a/README b/README new file mode 100644 index 0000000..7c1c49d --- /dev/null +++ b/README @@ -0,0 +1,58 @@ +======================================= +dbus-python_: Python bindings for D-Bus +======================================= + +.. _dbus-python: http://www.freedesktop.org/wiki/Software/DBusBindings#python + +Usage +===== + +Online documentation can be found at +. + +There is an incomplete tutorial in `doc/tutorial.txt`__ +(if you compile dbus-python with `docutils`_' ``rst2html`` tool installed or +you're reading this document on the D-Bus website, there's also an +`HTML version`__). + +__ doc/tutorial.txt +__ doc/tutorial.html + +`API documentation`_ is generated if you compile dbus-python with `epydoc`_ +version 3 and `docutils`_ installed. An `online copy of the API documentation`_ +is also available. + +.. _API documentation: api/index.html +.. _epydoc: http://epydoc.sourceforge.net/ +.. _docutils: http://docutils.sourceforge.net/ +.. _online copy of the API documentation: + http://dbus.freedesktop.org/doc/dbus-python/api/ + +To develop on dbus-python, see `doc/HACKING.txt`__ or the `HTML version`__. + +__ doc/HACKING.txt +__ doc/HACKING.html + +Problems and alternatives +========================= + +dbus-python might not be the best D-Bus binding for you to use. dbus-python +does not follow the principle of "In the face of ambiguity, refuse the +temptation to guess", and can't be changed to not do so without seriously +breaking compatibility. + +In addition, it uses libdbus (which has known problems with multi-threaded +use) and attempts to be main-loop-agnostic (which means you have to select +a suitable main loop for your application). + +Alternative ways to get your Python code onto D-Bus include: + +* GDBus, part of the GIO module of `GLib`_, via GObject-Introspection and + `PyGI`_ (uses the GLib main loop and object model) + +* QtDBus, part of `Qt`_, via `PyQt`_ (uses the Qt main loop and object model) + +.. _GLib: http://developer.gnome.org/glib/ +.. _PyGI: https://live.gnome.org/PyGObject +.. _Qt: https://qt.nokia.com/ +.. _PyQT: http://www.riverbankcomputing.co.uk/software/pyqt/intro diff --git a/_dbus_bindings/abstract.c b/_dbus_bindings/abstract.c new file mode 100644 index 0000000..7bdf368 --- /dev/null +++ b/_dbus_bindings/abstract.c @@ -0,0 +1,841 @@ +/* Subclasses of built-in Python types supporting extra D-Bus functionality. + * + * Copyright (C) 2006-2007 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include +#include + +#include "types-internal.h" + +/* Dict indexed by object IDs, whose values are nonzero variant levels + * for immutable variable-sized D-Bus data types (_LongBase, _StrBase, Struct). + * + * This is a strange way to store them, but adding a __dict__ to the offending + * objects seems even more error-prone, given that their sizes are variable! + */ +PyObject *_dbus_py_variant_levels = NULL; + +long +dbus_py_variant_level_get(PyObject *obj) +{ + PyObject *vl_obj; + PyObject *key = PyLong_FromVoidPtr(obj); + long variant_level; + + if (!key) { + return -1; + } + + vl_obj = PyDict_GetItem(_dbus_py_variant_levels, key); + Py_CLEAR(key); + + if (!vl_obj) { + /* PyDict_GetItem() does not set an exception when the key is missing. + * In our case, it just means that there was no entry in the variant + * dictionary for this object. Semantically, this is equivalent to a + * variant level of 0. + */ + return 0; + } + variant_level = NATIVEINT_ASLONG(vl_obj); + if (variant_level == -1 && PyErr_Occurred()) { + /* variant_level < 0 can never be inserted into the dictionary; see + * dbus_py_variant_level_set() below. The semantics of setting + * variant_level < 0 is to delete it from the dictionary. + */ + return -1; + } + assert(variant_level >= 0); + return variant_level; +} + +dbus_bool_t +dbus_py_variant_level_set(PyObject *obj, long variant_level) +{ + /* key is the object's ID (= pointer) to avoid referencing it */ + PyObject *key = PyLong_FromVoidPtr(obj); + + if (!key) { + return FALSE; + } + + if (variant_level <= 0) { + if (PyDict_GetItem (_dbus_py_variant_levels, key)) { + if (PyDict_DelItem (_dbus_py_variant_levels, key) < 0) { + Py_CLEAR(key); + return FALSE; + } + } + } + else { + PyObject *vl_obj = NATIVEINT_FROMLONG(variant_level); + if (!vl_obj) { + Py_CLEAR(key); + return FALSE; + } + if (PyDict_SetItem(_dbus_py_variant_levels, key, vl_obj) < 0) { + Py_CLEAR(vl_obj); + Py_CLEAR(key); + return FALSE; + } + Py_CLEAR(vl_obj); + } + Py_CLEAR(key); + return TRUE; +} + +PyObject * +dbus_py_variant_level_getattro(PyObject *obj, PyObject *name) +{ + PyObject *key, *value; + +#ifdef PY3 + if (PyUnicode_CompareWithASCIIString(name, "variant_level")) + return PyObject_GenericGetAttr(obj, name); +#else + if (PyBytes_Check(name)) { + Py_INCREF(name); + } + else if (PyUnicode_Check(name)) { + name = PyUnicode_AsEncodedString(name, NULL, NULL); + if (!name) { + return NULL; + } + } + else { + PyErr_SetString(PyExc_TypeError, "attribute name must be string"); + return NULL; + } + + if (strcmp(PyBytes_AS_STRING(name), "variant_level")) { + value = PyObject_GenericGetAttr(obj, name); + Py_CLEAR(name); + return value; + } + + Py_CLEAR(name); +#endif /* PY3 */ + + key = PyLong_FromVoidPtr(obj); + + if (!key) { + return NULL; + } + + value = PyDict_GetItem(_dbus_py_variant_levels, key); + Py_CLEAR(key); + + if (!value) + return NATIVEINT_FROMLONG(0); + Py_INCREF(value); + return value; +} + +/* To be invoked by destructors. Clear the variant level without touching the + * exception state */ +void +dbus_py_variant_level_clear(PyObject *self) +{ + PyObject *et, *ev, *etb; + + /* avoid clobbering any pending exception */ + PyErr_Fetch(&et, &ev, &etb); + if (!dbus_py_variant_level_set(self, 0)) { + /* should never happen */ + PyErr_WriteUnraisable(self); + } + PyErr_Restore(et, ev, etb); +} + +#ifndef PY3 +/* Support code for int subclasses. ================================== */ + +PyDoc_STRVAR(DBusPythonInt_tp_doc,\ +"Base class for int subclasses with a ``variant_level`` attribute.\n" +"Do not rely on the existence of this class outside dbus-python.\n" +); + +static PyMemberDef DBusPythonInt_tp_members[] = { + {"variant_level", T_LONG, offsetof(DBusPyIntBase, variant_level), + READONLY, + "The number of nested variants wrapping the real data. " + "0 if not in a variant."}, + {NULL}, +}; + +static PyObject * +DBusPythonInt_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes at most one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + self = (PyInt_Type.tp_new)(cls, args, NULL); + if (self) { + ((DBusPyIntBase *)self)->variant_level = variantness; + } + return self; +} + +static PyObject * +DBusPythonInt_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (PyInt_Type.tp_repr)(self); + long variant_level = ((DBusPyIntBase *)self)->variant_level; + PyObject *my_repr; + + if (!parent_repr) return NULL; + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V)", Py_TYPE(self)->tp_name, + REPRV(parent_repr)); + } + /* whether my_repr is NULL or not: */ + Py_CLEAR(parent_repr); + return my_repr; +} + +PyTypeObject DBusPyIntBase_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "_dbus_bindings._IntBase", + sizeof(DBusPyIntBase), + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + DBusPythonInt_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + DBusPythonInt_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + DBusPythonInt_tp_members, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&PyInt_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + PyType_GenericAlloc, /* tp_alloc */ + DBusPythonInt_tp_new, /* tp_new */ + PyObject_Del, /* tp_free */ +}; +#endif /* !PY3 */ + +/* Support code for float subclasses. ================================ */ + +/* There's only one subclass at the moment (Double) but these are factored +out to make room for Float later. (Float is implemented and #if'd out) */ + +PyDoc_STRVAR(DBusPythonFloat_tp_doc,\ +"Base class for float subclasses with a ``variant_level`` attribute.\n" +"Do not rely on the existence of this class outside dbus-python.\n" +); + +static PyMemberDef DBusPythonFloat_tp_members[] = { + {"variant_level", T_LONG, offsetof(DBusPyFloatBase, variant_level), + READONLY, + "The number of nested variants wrapping the real data. " + "0 if not in a variant."}, + {NULL}, +}; + +static PyObject * +DBusPythonFloat_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes at most one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + self = (PyFloat_Type.tp_new)(cls, args, NULL); + if (self) { + ((DBusPyFloatBase *)self)->variant_level = variantness; + } + return self; +} + +static PyObject * +DBusPythonFloat_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (PyFloat_Type.tp_repr)(self); + long variant_level = ((DBusPyFloatBase *)self)->variant_level; + PyObject *my_repr; + + if (!parent_repr) return NULL; + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V)", Py_TYPE(self)->tp_name, + REPRV(parent_repr)); + } + /* whether my_repr is NULL or not: */ + Py_CLEAR(parent_repr); + return my_repr; +} + +PyTypeObject DBusPyFloatBase_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "_dbus_bindings._FloatBase", + sizeof(DBusPyFloatBase), + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + DBusPythonFloat_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + DBusPythonFloat_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + DBusPythonFloat_tp_members, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&PyFloat_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + DBusPythonFloat_tp_new, /* tp_new */ +}; + +#ifdef PY3 +/* Support code for bytes subclasses ================================== */ + +PyDoc_STRVAR(DBusPythonBytes_tp_doc,\ +"Base class for bytes subclasses with a ``variant_level`` attribute.\n" +"Do not rely on the existence of this class outside dbus-python.\n" +); + +static PyObject * +DBusPythonBytes_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes at most one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) + return NULL; + + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + self = (PyBytes_Type.tp_new)(cls, args, NULL); + if (self) { + if (!dbus_py_variant_level_set(self, variantness)) { + Py_CLEAR(self); + return NULL; + } + } + return self; +} + +static PyObject * +DBusPythonBytes_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (PyBytes_Type.tp_repr)(self); + PyObject *vl_obj; + PyObject *my_repr; + long variant_level; + + if (!parent_repr) return NULL; + vl_obj = PyObject_GetAttr(self, dbus_py_variant_level_const); + if (!vl_obj) { + Py_CLEAR(parent_repr); + return NULL; + } + variant_level = NATIVEINT_ASLONG(vl_obj); + Py_CLEAR(vl_obj); + if (variant_level == -1 && PyErr_Occurred()) { + Py_CLEAR(parent_repr); + return NULL; + } + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V)", Py_TYPE(self)->tp_name, + REPRV(parent_repr)); + } + /* whether my_repr is NULL or not: */ + Py_CLEAR(parent_repr); + return my_repr; +} + +static void +DBusPyBytesBase_tp_dealloc(PyObject *self) +{ + dbus_py_variant_level_clear(self); + (PyBytes_Type.tp_dealloc)(self); +} + +PyTypeObject DBusPyBytesBase_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "_dbus_bindings._BytesBase", + 0, + 0, + DBusPyBytesBase_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + DBusPythonBytes_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + dbus_py_variant_level_getattro, /* tp_getattro */ + dbus_py_immutable_setattro, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + DBusPythonBytes_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&PyBytes_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + DBusPythonBytes_tp_new, /* tp_new */ +}; +#endif /* PY3 */ + +/* Support code for str subclasses ================================== */ + +PyDoc_STRVAR(DBusPythonString_tp_doc,\ +"Base class for str subclasses with a ``variant_level`` attribute.\n" +"Do not rely on the existence of this class outside dbus-python.\n" +); + +static PyObject * +DBusPythonString_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes at most one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + self = (NATIVESTR_TYPE.tp_new)(cls, args, NULL); + if (self) { + if (!dbus_py_variant_level_set(self, variantness)) { + Py_CLEAR(self); + return NULL; + } + } + return self; +} + +static PyObject * +DBusPythonString_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (NATIVESTR_TYPE.tp_repr)(self); + PyObject *vl_obj; + PyObject *my_repr; + long variant_level; + + if (!parent_repr) return NULL; + vl_obj = PyObject_GetAttr(self, dbus_py_variant_level_const); + if (!vl_obj) { + Py_CLEAR(parent_repr); + return NULL; + } + variant_level = NATIVEINT_ASLONG(vl_obj); + Py_CLEAR(vl_obj); + if (variant_level == -1 && PyErr_Occurred()) { + Py_CLEAR(parent_repr); + return NULL; + } + + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V)", Py_TYPE(self)->tp_name, + REPRV(parent_repr)); + } + /* whether my_repr is NULL or not: */ + Py_CLEAR(parent_repr); + return my_repr; +} + +static void +DBusPyStrBase_tp_dealloc(PyObject *self) +{ + dbus_py_variant_level_clear(self); + (NATIVESTR_TYPE.tp_dealloc)(self); +} + +PyTypeObject DBusPyStrBase_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "_dbus_bindings._StrBase", + 0, + 0, + DBusPyStrBase_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + DBusPythonString_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + dbus_py_variant_level_getattro, /* tp_getattro */ + dbus_py_immutable_setattro, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + DBusPythonString_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&NATIVESTR_TYPE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + DBusPythonString_tp_new, /* tp_new */ +}; + +/* Support code for long subclasses ================================= */ + +PyDoc_STRVAR(DBusPythonLong_tp_doc,\ +"Base class for ``long`` subclasses with a ``variant_level`` attribute.\n" +"Do not rely on the existence of this class outside dbus-python.\n" +); + +static PyObject * +DBusPythonLong_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes at most one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + self = (PyLong_Type.tp_new)(cls, args, NULL); + if (self) { + if (!dbus_py_variant_level_set(self, variantness)) { + Py_CLEAR(self); + return NULL; + } + } + return self; +} + +static PyObject * +DBusPythonLong_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (PyLong_Type.tp_repr)(self); + PyObject *vl_obj; + PyObject *my_repr; + long variant_level; + + if (!parent_repr) return NULL; + vl_obj = PyObject_GetAttr(self, dbus_py_variant_level_const); + if (!vl_obj) { + Py_CLEAR(parent_repr); + return NULL; + } + variant_level = NATIVEINT_ASLONG(vl_obj); + Py_CLEAR(vl_obj); + if (variant_level < 0 && PyErr_Occurred()) { + Py_CLEAR(parent_repr); + return NULL; + } + + if (variant_level) { + my_repr = PyUnicode_FromFormat("%s(%V, variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V)", Py_TYPE(self)->tp_name, + REPRV(parent_repr)); + } + /* whether my_repr is NULL or not: */ + Py_CLEAR(parent_repr); + return my_repr; +} + +static void +DBusPyLongBase_tp_dealloc(PyObject *self) +{ + dbus_py_variant_level_clear(self); + (PyLong_Type.tp_dealloc)(self); +} + +PyTypeObject DBusPyLongBase_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "_dbus_bindings._LongBase", + 0, + 0, + DBusPyLongBase_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + DBusPythonLong_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + dbus_py_variant_level_getattro, /* tp_getattro */ + dbus_py_immutable_setattro, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + DBusPythonLong_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&PyLong_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + DBusPythonLong_tp_new, /* tp_new */ +}; + +PyObject *dbus_py_variant_level_const = NULL; +PyObject *dbus_py_signature_const = NULL; +PyObject *dbus_py__dbus_object_path__const = NULL; + +#ifdef PY3 +#define INTERN (PyUnicode_InternFromString) +#else +/* Neither Python 2.6 nor 2.7 define the expected PyBytes_InternFromString + * alias in bytesobject.h. + */ +#define INTERN (PyString_InternFromString) +#endif + +dbus_bool_t +dbus_py_init_abstract(void) +{ + _dbus_py_variant_levels = PyDict_New(); + if (!_dbus_py_variant_levels) return 0; + + dbus_py__dbus_object_path__const = INTERN("__dbus_object_path__"); + if (!dbus_py__dbus_object_path__const) return 0; + + dbus_py_variant_level_const = INTERN("variant_level"); + if (!dbus_py_variant_level_const) return 0; + + dbus_py_signature_const = INTERN("signature"); + if (!dbus_py_signature_const) return 0; + +#ifdef PY3 + DBusPyBytesBase_Type.tp_base = &PyBytes_Type; + if (PyType_Ready(&DBusPyBytesBase_Type) < 0) return 0; + DBusPyBytesBase_Type.tp_print = NULL; +#else + DBusPyIntBase_Type.tp_base = &PyInt_Type; + if (PyType_Ready(&DBusPyIntBase_Type) < 0) return 0; + /* disable the tp_print copied from PyInt_Type, so tp_repr gets called as + desired */ + DBusPyIntBase_Type.tp_print = NULL; +#endif + + DBusPyFloatBase_Type.tp_base = &PyFloat_Type; + if (PyType_Ready(&DBusPyFloatBase_Type) < 0) return 0; + DBusPyFloatBase_Type.tp_print = NULL; + + DBusPyLongBase_Type.tp_base = &PyLong_Type; + if (PyType_Ready(&DBusPyLongBase_Type) < 0) return 0; + DBusPyLongBase_Type.tp_print = NULL; + + DBusPyStrBase_Type.tp_base = &NATIVESTR_TYPE; + if (PyType_Ready(&DBusPyStrBase_Type) < 0) return 0; + DBusPyStrBase_Type.tp_print = NULL; + + return 1; +} + +dbus_bool_t +dbus_py_insert_abstract_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ +#ifdef PY3 + Py_INCREF(&DBusPyBytesBase_Type); + if (PyModule_AddObject(this_module, "_BytesBase", + (PyObject *)&DBusPyBytesBase_Type) < 0) return 0; +#else + Py_INCREF(&DBusPyIntBase_Type); + if (PyModule_AddObject(this_module, "_IntBase", + (PyObject *)&DBusPyIntBase_Type) < 0) return 0; +#endif + Py_INCREF(&DBusPyLongBase_Type); + Py_INCREF(&DBusPyStrBase_Type); + Py_INCREF(&DBusPyFloatBase_Type); + if (PyModule_AddObject(this_module, "_LongBase", + (PyObject *)&DBusPyLongBase_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "_StrBase", + (PyObject *)&DBusPyStrBase_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "_FloatBase", + (PyObject *)&DBusPyFloatBase_Type) < 0) return 0; + + return 1; +} diff --git a/_dbus_bindings/bus.c b/_dbus_bindings/bus.c new file mode 100644 index 0000000..ef257f3 --- /dev/null +++ b/_dbus_bindings/bus.c @@ -0,0 +1,199 @@ +/* Implementation of Bus, a subtype of Connection. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include "conn-internal.h" + +PyObject * +DBusPyConnection_NewForBus(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *first = NULL, *mainloop = NULL; + DBusConnection *conn; + DBusError error; + Connection *self; + static char *argnames[] = {"address_or_type", "mainloop", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OO", argnames, + &first, &mainloop)) { + return NULL; + } + + dbus_error_init(&error); + + if (first && +#ifdef PY3 + PyUnicode_Check(first) +#else + PyBytes_Check(first) +#endif + ) + { + dbus_bool_t ret; + + /* It's a custom address. First connect to it, then register. */ + + self = (Connection *)(DBusPyConnection_Type.tp_new)(cls, args, kwargs); + if (!self) return NULL; + TRACE(self); + + Py_BEGIN_ALLOW_THREADS + ret = dbus_bus_register(self->conn, &error); + Py_END_ALLOW_THREADS + if (!ret) { + DBusPyException_ConsumeError(&error); + Py_CLEAR(self); + return NULL; + } + + return (PyObject *)self; + } + else if (!first || INTORLONG_CHECK(first)) + { + long type; + PyObject *libdbusconn; + PyObject *new_args; + PyObject *new_kwargs; + + /* If the first argument isn't a string, it must be an integer + representing one of the well-known bus types. The default is + DBUS_BUS_SESSION. */ + + if (first) { + /* on Python 2 this accepts either int or long */ + type = PyLong_AsLong(first); + if (type == -1 && PyErr_Occurred()) + return NULL; + + if (type != DBUS_BUS_SESSION && type != DBUS_BUS_SYSTEM + && type != DBUS_BUS_STARTER) { + PyErr_Format(PyExc_ValueError, "Unknown bus type %ld", type); + return NULL; + } + } + else { + type = DBUS_BUS_SESSION; + } + + Py_BEGIN_ALLOW_THREADS + conn = dbus_bus_get_private(type, &error); + Py_END_ALLOW_THREADS + + if (!conn) { + DBusPyException_ConsumeError(&error); + return NULL; + } + + libdbusconn = DBusPyLibDBusConnection_New (conn); + dbus_connection_unref (conn); + + if (!libdbusconn) + return NULL; + + new_args = PyTuple_Pack(2, libdbusconn, mainloop ? mainloop : Py_None); + Py_CLEAR(libdbusconn); + + if (!new_args) { + return NULL; + } + + new_kwargs = PyDict_New(); + + if (!new_kwargs) { + Py_CLEAR(new_args); + return NULL; + } + + self = (Connection *)(DBusPyConnection_Type.tp_new)(cls, new_args, + new_kwargs); + Py_CLEAR(new_args); + Py_CLEAR(new_kwargs); + + return (PyObject *)self; /* whether NULL or not */ + } + else { + PyErr_SetString(PyExc_TypeError, "A string address or an integer " + "bus type is required"); + return NULL; + } +} + +PyObject * +DBusPyConnection_GetUniqueName(Connection *self, PyObject *args UNUSED) +{ + const char *name; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + name = dbus_bus_get_unique_name(self->conn); + Py_END_ALLOW_THREADS + if (!name) { + return DBusPyException_SetString("This connection has no unique name " + "yet"); + } + return NATIVESTR_FROMSTR(name); +} + +PyObject * +DBusPyConnection_SetUniqueName(Connection *self, PyObject *args) +{ + const char *old_name, *new_name; + + if (!PyArg_ParseTuple(args, "s:set_unique_name", &new_name)) { + return NULL; + } + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + + /* libdbus will assert if we try to set a unique name when there's + * already one, so we need to make sure that can't happen. + * (Thanks, libdbus.) + * + * The things that can set the unique name are: + * - this function - but we don't release the GIL, so only one instance of + * this function can run + * - dbus_bus_get - but this is only called in a __new__ or __new__-like + * function, so the new connection isn't available to other code yet + * and this function can't be called on it + * - dbus_bus_register - same as dbus_bus_get + * + * Code outside dbus-python shouldn't be setting the unique name, because + * we're using a private connection; we have to trust the authors + * of mainloop bindings not to do silly things like that. + */ + old_name = dbus_bus_get_unique_name(self->conn); + if (old_name != NULL) { + PyErr_Format(PyExc_ValueError, "This connection already has a " + "unique name: '%s'", old_name); + return NULL; + } + dbus_bus_set_unique_name(self->conn, new_name); + + Py_RETURN_NONE; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/bytes.c b/_dbus_bindings/bytes.c new file mode 100644 index 0000000..b0ff817 --- /dev/null +++ b/_dbus_bindings/bytes.c @@ -0,0 +1,300 @@ +/* D-Bus Byte and ByteArray types. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include +#include + +#include "types-internal.h" + +#ifdef PY3 +#define DBUS_PY_BYTE_BASE (DBusPyLongBase_Type) +#else +#define DBUS_PY_BYTE_BASE (DBusPyIntBase_Type) +#endif + +PyDoc_STRVAR(Byte_tp_doc, +"An unsigned byte: a subtype of int, with range restricted to [0, 255].\n" +"\n" +"A Byte b may be converted to a str of length 1 via str(b) == chr(b).\n" +"\n" +"Most of the time you don't want to use this class - it mainly exists\n" +"for symmetry with the other D-Bus types. See `dbus.ByteArray` for a\n" +"better way to handle arrays of Byte.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Byte(integer or str of length 1[, variant_level])\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a byte, this is represented in Python by a\n" +" Byte with variant_level==2.\n" +); + +static PyObject * +Byte_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *obj; + PyObject *tuple; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, "Byte constructor takes no more " + "than one positional argument"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + /* obj is a borrowed reference. It gets turned into an owned reference on + * the good-path of the if-statements below. + */ + obj = PyTuple_GetItem(args, 0); + + if (PyBytes_Check(obj)) { + /* string of length 1, we hope */ + if (PyBytes_GET_SIZE(obj) != 1) { + goto bad_arg; + } + obj = NATIVEINT_FROMLONG((unsigned char)(PyBytes_AS_STRING(obj)[0])); + if (!obj) + goto bad_arg; + } + else if (INTORLONG_CHECK(obj)) { + /* on Python 2 this accepts either int or long */ + long i = PyLong_AsLong(obj); + long my_variant_level; + + if (i == -1 && PyErr_Occurred()) + goto bad_arg; + +#ifdef PY3 + my_variant_level = dbus_py_variant_level_get(obj); + if (my_variant_level < 0) + return NULL; +#else + my_variant_level = ((DBusPyIntBase *)obj)->variant_level; +#endif + if (Py_TYPE(obj) == cls && my_variant_level == variantness) { + Py_INCREF(obj); + return obj; + } + if (i < 0 || i > 255) goto bad_range; + /* else make it a new reference */ + Py_INCREF(obj); + } + else { + goto bad_arg; + } + + /* The tuple steals the reference to obj. */ + tuple = Py_BuildValue("(N)", obj); + if (!tuple) return NULL; + + obj = DBUS_PY_BYTE_BASE.tp_new(cls, tuple, kwargs); + Py_CLEAR(tuple); + return obj; + +bad_arg: + PyErr_SetString(PyExc_TypeError, "Expected a bytes or str of length 1, " + "or an int in the range 0-255"); + return NULL; +bad_range: + PyErr_SetString(PyExc_ValueError, "Integer outside range 0-255"); + return NULL; +} + +static PyObject * +Byte_tp_str(PyObject *self) +{ + long i = NATIVEINT_ASLONG(self); + unsigned char str[2] = { 0, 0 }; + + if (i == -1 && PyErr_Occurred()) + return NULL; + if (i < 0 || i > 255) { + PyErr_SetString(PyExc_RuntimeError, "Integer outside range 0-255"); + return NULL; + } + + str[0] = (unsigned char)i; + return PyUnicode_FromStringAndSize((char *)str, 1); +} + +PyTypeObject DBusPyByte_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Byte", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + Byte_tp_str, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Byte_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBUS_PY_BYTE_BASE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Byte_new, /* tp_new */ +}; + +#ifdef PY3 +#define DBUS_PY_BYTEARRAY_BASE (DBusPyBytesBase_Type) +#else +#define DBUS_PY_BYTEARRAY_BASE (DBusPyStrBase_Type) +#endif + +PyDoc_STRVAR(ByteArray_tp_doc, +"ByteArray is a subtype of str which can be used when you want an\n" +"efficient immutable representation of a D-Bus byte array (signature 'ay').\n" +"\n" +"By default, when byte arrays are converted from D-Bus to Python, they\n" +"come out as a `dbus.Array` of `dbus.Byte`. This is just for symmetry with\n" +"the other D-Bus types - in practice, what you usually want is the byte\n" +"array represented as a string, using this class. To get this, pass the\n" +"``byte_arrays=True`` keyword argument to any of these methods:\n" +"\n" +"* any D-Bus method proxy, or ``connect_to_signal``, on the objects returned\n" +" by `Bus.get_object`\n" +"* any D-Bus method on a `dbus.Interface`\n" +"* `dbus.Interface.connect_to_signal`\n" +"* `Bus.add_signal_receiver`\n" +"\n" +"Import via::\n" +"\n" +" from dbus import ByteArray\n" +"\n" +"Constructor::\n" +"\n" +" ByteArray(str)\n" +); + +PyTypeObject DBusPyByteArray_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.ByteArray", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + ByteArray_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBUS_PY_BYTEARRAY_BASE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_byte_types(void) +{ + DBusPyByte_Type.tp_base = &DBUS_PY_BYTE_BASE; + if (PyType_Ready(&DBusPyByte_Type) < 0) return 0; + DBusPyByte_Type.tp_print = NULL; + + DBusPyByteArray_Type.tp_base = &DBUS_PY_BYTEARRAY_BASE; + if (PyType_Ready(&DBusPyByteArray_Type) < 0) return 0; + DBusPyByteArray_Type.tp_print = NULL; + + return 1; +} + +dbus_bool_t +dbus_py_insert_byte_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF(&DBusPyByte_Type); + if (PyModule_AddObject(this_module, "Byte", + (PyObject *)&DBusPyByte_Type) < 0) return 0; + Py_INCREF(&DBusPyByteArray_Type); + if (PyModule_AddObject(this_module, "ByteArray", + (PyObject *)&DBusPyByteArray_Type) < 0) return 0; + + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/compat-internal.h b/_dbus_bindings/compat-internal.h new file mode 100644 index 0000000..9b9dce4 --- /dev/null +++ b/_dbus_bindings/compat-internal.h @@ -0,0 +1,32 @@ +/* Old D-Bus compatibility: implementation internals + * + * Copyright © 2006-2011 Collabora Ltd. + * Copyright © 2011 Nokia Corporation + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef DBUS_BINDINGS_COMPAT_INTERNAL_H +#define DBUS_BINDINGS_COMPAT_INTERNAL_H + +#include "dbus_bindings-internal.h" + +#endif diff --git a/_dbus_bindings/conn-internal.h b/_dbus_bindings/conn-internal.h new file mode 100644 index 0000000..f4c7a80 --- /dev/null +++ b/_dbus_bindings/conn-internal.h @@ -0,0 +1,67 @@ +/* _dbus_bindings internal API. For use within _dbus_bindings only. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef DBUS_BINDINGS_CONN_H +#define DBUS_BINDINGS_CONN_H + +#include "dbus_bindings-internal.h" + +typedef struct { + PyObject_HEAD + DBusConnection *conn; + /* A list of filter callbacks. */ + PyObject *filters; + /* A dict mapping object paths to one of: + * - tuples (unregister_callback or None, message_callback) + * - None (meaning unregistration from libdbus is in progress and nobody + * should touch this entry til we're finished) + */ + PyObject *object_paths; + + /* Weak-references list to make Connections weakly referenceable */ + PyObject *weaklist; + + dbus_bool_t has_mainloop; +} Connection; + +typedef struct { + PyObject_HEAD + DBusConnection *conn; +} DBusPyLibDBusConnection; + +extern struct PyMethodDef DBusPyConnection_tp_methods[]; +extern DBusHandlerResult DBusPyConnection_HandleMessage(Connection *, + PyObject *, + PyObject *); +extern PyObject *DBusPyConnection_ExistingFromDBusConnection(DBusConnection *); +extern PyObject *DBusPyConnection_GetObjectPathHandlers(PyObject *self, + PyObject *path); + +extern PyObject *DBusPyConnection_NewForBus(PyTypeObject *cls, PyObject *args, + PyObject *kwargs); +extern PyObject *DBusPyConnection_SetUniqueName(Connection *, PyObject *); +extern PyObject *DBusPyConnection_GetUniqueName(Connection *, PyObject *); + +#endif diff --git a/_dbus_bindings/conn-methods.c b/_dbus_bindings/conn-methods.c new file mode 100644 index 0000000..424fdc4 --- /dev/null +++ b/_dbus_bindings/conn-methods.c @@ -0,0 +1,1068 @@ +/* Implementation of normal Python-accessible methods on the _dbus_bindings + * Connection type; separated out to keep the file size manageable. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include "conn-internal.h" + +static void +_object_path_unregister(DBusConnection *conn, void *user_data) +{ + PyGILState_STATE gil = PyGILState_Ensure(); + PyObject *tuple = NULL; + Connection *conn_obj = NULL; + PyObject *callable; + + conn_obj = (Connection *)DBusPyConnection_ExistingFromDBusConnection(conn); + if (!conn_obj) goto out; + TRACE(conn_obj); + + DBG("Connection at %p unregistering object path %s", + conn_obj, PyBytes_AS_STRING((PyObject *)user_data)); + tuple = DBusPyConnection_GetObjectPathHandlers( + (PyObject *)conn_obj, (PyObject *)user_data); + if (!tuple) goto out; + if (tuple == Py_None) goto out; + + DBG("%s", "... yes we have handlers for that object path"); + + /* 0'th item is the unregisterer (if that's a word) */ + callable = PyTuple_GetItem(tuple, 0); + if (callable && callable != Py_None) { + DBG("%s", "... and we even have an unregisterer"); + /* any return from the unregisterer is ignored */ + Py_XDECREF(PyObject_CallFunctionObjArgs(callable, conn_obj, NULL)); + } +out: + Py_CLEAR(conn_obj); + Py_CLEAR(tuple); + /* the user_data (a Python str) is no longer ref'd by the DBusConnection */ + Py_CLEAR(user_data); + if (PyErr_Occurred()) { + PyErr_Print(); + } + PyGILState_Release(gil); +} + +static DBusHandlerResult +_object_path_message(DBusConnection *conn, DBusMessage *message, + void *user_data) +{ + DBusHandlerResult ret; + PyGILState_STATE gil = PyGILState_Ensure(); + Connection *conn_obj = NULL; + PyObject *tuple = NULL; + PyObject *msg_obj; + PyObject *callable; /* borrowed */ + + dbus_message_ref(message); + msg_obj = DBusPyMessage_ConsumeDBusMessage(message); + if (!msg_obj) { + ret = DBUS_HANDLER_RESULT_NEED_MEMORY; + goto out; + } + + conn_obj = (Connection *)DBusPyConnection_ExistingFromDBusConnection(conn); + if (!conn_obj) { + ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + goto out; + } + TRACE(conn_obj); + + DBG("Connection at %p messaging object path %s", + conn_obj, PyBytes_AS_STRING((PyObject *)user_data)); + DBG_DUMP_MESSAGE(message); + tuple = DBusPyConnection_GetObjectPathHandlers( + (PyObject *)conn_obj, (PyObject *)user_data); + if (!tuple || tuple == Py_None) { + ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + goto out; + } + + DBG("%s", "... yes we have handlers for that object path"); + + /* 1st item (0-based) is the message callback */ + callable = PyTuple_GetItem(tuple, 1); + if (!callable) { + DBG("%s", "... error getting message handler from tuple"); + ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + else if (callable == Py_None) { + /* there was actually no handler after all */ + DBG("%s", "... but those handlers don't do messages"); + ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + else { + DBG("%s", "... and we have a message handler for that object path"); + ret = DBusPyConnection_HandleMessage(conn_obj, msg_obj, callable); + } + +out: + Py_CLEAR(msg_obj); + Py_CLEAR(conn_obj); + Py_CLEAR(tuple); + if (PyErr_Occurred()) { + PyErr_Print(); + } + PyGILState_Release(gil); + return ret; +} + +static const DBusObjectPathVTable _object_path_vtable = { + _object_path_unregister, + _object_path_message, +}; + +static DBusHandlerResult +_filter_message(DBusConnection *conn, DBusMessage *message, void *user_data) +{ + DBusHandlerResult ret; + PyGILState_STATE gil = PyGILState_Ensure(); + Connection *conn_obj = NULL; + PyObject *callable = NULL; + PyObject *msg_obj; +#ifndef DBUS_PYTHON_DISABLE_CHECKS + Py_ssize_t i, size; +#endif + + dbus_message_ref(message); + msg_obj = DBusPyMessage_ConsumeDBusMessage(message); + if (!msg_obj) { + DBG("%s", "OOM while trying to construct Message"); + ret = DBUS_HANDLER_RESULT_NEED_MEMORY; + goto out; + } + + conn_obj = (Connection *)DBusPyConnection_ExistingFromDBusConnection(conn); + if (!conn_obj) { + DBG("%s", "failed to traverse DBusConnection -> Connection weakref"); + ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + goto out; + } + TRACE(conn_obj); + + /* The user_data is a pointer to a Python object. To avoid + * cross-library reference cycles, the DBusConnection isn't allowed + * to reference it. However, as long as the Connection is still + * alive, its ->filters list owns a reference to the same Python + * object, so the object should also still be alive. + * + * To ensure that this works, be careful whenever manipulating the + * filters list! (always put things in the list *before* giving + * them to libdbus, etc.) + */ +#ifdef DBUS_PYTHON_DISABLE_CHECKS + callable = (PyObject *)user_data; +#else + size = PyList_GET_SIZE(conn_obj->filters); + for (i = 0; i < size; i++) { + callable = PyList_GET_ITEM(conn_obj->filters, i); + if (callable == user_data) { + Py_INCREF(callable); + break; + } + else { + callable = NULL; + } + } + + if (!callable) { + DBG("... filter %p has vanished from ->filters, so not calling it", + user_data); + ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + goto out; + } +#endif + + ret = DBusPyConnection_HandleMessage(conn_obj, msg_obj, callable); +out: + Py_CLEAR(msg_obj); + Py_CLEAR(conn_obj); + Py_CLEAR(callable); + PyGILState_Release(gil); + return ret; +} + +PyDoc_STRVAR(Connection__require_main_loop__doc__, +"_require_main_loop()\n\n" +"Raise an exception if this Connection is not bound to any main loop -\n" +"in this state, asynchronous calls, receiving signals and exporting objects\n" +"will not work.\n" +"\n" +"`dbus.mainloop.NULL_MAIN_LOOP` is treated like a valid main loop - if you're\n" +"using that, you presumably know what you're doing.\n"); +static PyObject * +Connection__require_main_loop (Connection *self, PyObject *args UNUSED) +{ + if (!self->has_mainloop) { + PyErr_SetString(PyExc_RuntimeError, + "To make asynchronous calls, receive signals or " + "export objects, D-Bus connections must be attached " + "to a main loop by passing mainloop=... to the " + "constructor or calling " + "dbus.set_default_main_loop(...)"); + return NULL; + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Connection_close__doc__, +"close()\n\n" +"Close the connection."); +static PyObject * +Connection_close (Connection *self, PyObject *args UNUSED) +{ + TRACE(self); + /* Because the user explicitly asked to close the connection, we'll even + let them close shared connections. */ + if (self->conn) { + Py_BEGIN_ALLOW_THREADS + dbus_connection_close(self->conn); + Py_END_ALLOW_THREADS + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Connection_get_is_connected__doc__, +"get_is_connected() -> bool\n\n" +"Return true if this Connection is connected.\n"); +static PyObject * +Connection_get_is_connected (Connection *self, PyObject *args UNUSED) +{ + dbus_bool_t ret; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + ret = dbus_connection_get_is_connected(self->conn); + Py_END_ALLOW_THREADS + return PyBool_FromLong(ret); +} + +PyDoc_STRVAR(Connection_get_is_authenticated__doc__, +"get_is_authenticated() -> bool\n\n" +"Return true if this Connection was ever authenticated.\n"); +static PyObject * +Connection_get_is_authenticated (Connection *self, PyObject *args UNUSED) +{ + dbus_bool_t ret; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + ret = dbus_connection_get_is_authenticated(self->conn); + Py_END_ALLOW_THREADS + return PyBool_FromLong(ret); +} + +PyDoc_STRVAR(Connection_set_exit_on_disconnect__doc__, +"set_exit_on_disconnect(bool)\n\n" +"Set whether the C function ``_exit`` will be called when this Connection\n" +"becomes disconnected. This will cause the program to exit without calling\n" +"any cleanup code or exit handlers.\n" +"\n" +"The default is for this feature to be disabled for Connections and enabled\n" +"for Buses.\n"); +static PyObject * +Connection_set_exit_on_disconnect (Connection *self, PyObject *args) +{ + int exit_on_disconnect; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTuple(args, "i:set_exit_on_disconnect", + &exit_on_disconnect)) { + return NULL; + } + Py_BEGIN_ALLOW_THREADS + dbus_connection_set_exit_on_disconnect(self->conn, + exit_on_disconnect ? 1 : 0); + Py_END_ALLOW_THREADS + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Connection_send_message__doc__, +"send_message(msg) -> long\n\n" +"Queue the given message for sending, and return the message serial number.\n" +"\n" +":Parameters:\n" +" `msg` : dbus.lowlevel.Message\n" +" The message to be sent.\n" +); +static PyObject * +Connection_send_message(Connection *self, PyObject *args) +{ + dbus_bool_t ok; + PyObject *obj; + DBusMessage *msg; + dbus_uint32_t serial; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTuple(args, "O", &obj)) return NULL; + + msg = DBusPyMessage_BorrowDBusMessage(obj); + if (!msg) return NULL; + + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_send(self->conn, msg, &serial); + Py_END_ALLOW_THREADS + + if (!ok) { + return PyErr_NoMemory(); + } + + return PyLong_FromUnsignedLong(serial); +} + +PyDoc_STRVAR(Connection_set_allow_anonymous__doc__, +"set_allow_anonymous(bool)\n\n" +"Allows anonymous clients. Call this on the server side of a connection in a on_connection_added callback" +); +static PyObject * +Connection_set_allow_anonymous(Connection *self, PyObject *args) +{ + dbus_bool_t t; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTuple(args, "i", &t)) { + return NULL; + } + + Py_BEGIN_ALLOW_THREADS + dbus_connection_set_allow_anonymous(self->conn, t ? 1 : 0); + Py_END_ALLOW_THREADS + Py_RETURN_NONE; +} + +/* The timeout is in seconds here, since that's conventional in Python. */ +PyDoc_STRVAR(Connection_send_message_with_reply__doc__, +"send_message_with_reply(msg, reply_handler, timeout_s=-1, " +"require_main_loop=False) -> dbus.lowlevel.PendingCall\n\n" +"Queue the message for sending; expect a reply via the returned PendingCall,\n" +"which can also be used to cancel the pending call.\n" +"\n" +":Parameters:\n" +" `msg` : dbus.lowlevel.Message\n" +" The message to be sent\n" +" `reply_handler` : callable\n" +" Asynchronous reply handler: will be called with one positional\n" +" parameter, a Message instance representing the reply.\n" +" `timeout_s` : float\n" +" If the reply takes more than this many seconds, a timeout error\n" +" will be created locally and raised instead. If this timeout is\n" +" negative (default), a sane default (supplied by libdbus) is used.\n" +" `require_main_loop` : bool\n" +" If True, raise RuntimeError if this Connection does not have a main\n" +" loop configured. If False (default) and there is no main loop, you are\n" +" responsible for calling block() on the PendingCall.\n" +"\n" +); +static PyObject * +Connection_send_message_with_reply(Connection *self, PyObject *args, PyObject *kw) +{ + dbus_bool_t ok; + double timeout_s = -1.0; + int timeout_ms; + PyObject *obj, *callable; + DBusMessage *msg; + DBusPendingCall *pending; + int require_main_loop = 0; + static char *argnames[] = {"msg", "reply_handler", "timeout_s", + "require_main_loop", NULL}; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTupleAndKeywords(args, kw, + "OO|di:send_message_with_reply", + argnames, + &obj, &callable, &timeout_s, + &require_main_loop)) { + return NULL; + } + if (require_main_loop && !Connection__require_main_loop(self, NULL)) { + return NULL; + } + + msg = DBusPyMessage_BorrowDBusMessage(obj); + if (!msg) return NULL; + + if (timeout_s < 0) { + timeout_ms = -1; + } + else { + if (timeout_s > ((double)INT_MAX) / 1000.0) { + PyErr_SetString(PyExc_ValueError, "Timeout too long"); + return NULL; + } + timeout_ms = (int)(timeout_s * 1000.0); + } + + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_send_with_reply(self->conn, msg, &pending, + timeout_ms); + Py_END_ALLOW_THREADS + + if (!ok) { + return PyErr_NoMemory(); + } + + if (!pending) { + /* connection is disconnected (doesn't return FALSE!) */ + return DBusPyException_SetString ("Connection is disconnected - " + "unable to make method call"); + } + + return DBusPyPendingCall_ConsumeDBusPendingCall(pending, callable); +} + +/* Again, the timeout is in seconds, since that's conventional in Python. */ +PyDoc_STRVAR(Connection_send_message_with_reply_and_block__doc__, +"send_message_with_reply_and_block(msg, timeout_s=-1)" +" -> dbus.lowlevel.Message\n\n" +"Send the message and block while waiting for a reply.\n" +"\n" +"This does not re-enter the main loop, so it can lead to a deadlock, if\n" +"the called method tries to make a synchronous call to a method in this\n" +"application. As such, it's probably a bad idea.\n" +"\n" +":Parameters:\n" +" `msg` : dbus.lowlevel.Message\n" +" The message to be sent\n" +" `timeout_s` : float\n" +" If the reply takes more than this many seconds, a timeout error\n" +" will be created locally and raised instead. If this timeout is\n" +" negative (default), a sane default (supplied by libdbus) is used.\n" +":Returns:\n" +" A `dbus.lowlevel.Message` instance (probably a `dbus.lowlevel.MethodReturnMessage`) on success\n" +":Raises dbus.DBusException:\n" +" On error (including if the reply arrives but is an\n" +" error message)\n" +"\n" +); +static PyObject * +Connection_send_message_with_reply_and_block(Connection *self, PyObject *args) +{ + double timeout_s = -1.0; + int timeout_ms; + PyObject *obj; + DBusMessage *msg, *reply; + DBusError error; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTuple(args, "O|d:send_message_with_reply_and_block", &obj, + &timeout_s)) { + return NULL; + } + + msg = DBusPyMessage_BorrowDBusMessage(obj); + if (!msg) return NULL; + + if (timeout_s < 0) { + timeout_ms = -1; + } + else { + if (timeout_s > ((double)INT_MAX) / 1000.0) { + PyErr_SetString(PyExc_ValueError, "Timeout too long"); + return NULL; + } + timeout_ms = (int)(timeout_s * 1000.0); + } + + dbus_error_init(&error); + Py_BEGIN_ALLOW_THREADS + reply = dbus_connection_send_with_reply_and_block(self->conn, msg, + timeout_ms, &error); + Py_END_ALLOW_THREADS + + /* FIXME: if we instead used send_with_reply and blocked on the resulting + * PendingCall, then we could get all args from the error, not just + * the first */ + if (!reply) { + return DBusPyException_ConsumeError(&error); + } + return DBusPyMessage_ConsumeDBusMessage(reply); +} + +PyDoc_STRVAR(Connection_flush__doc__, +"flush()\n\n" +"Block until the outgoing message queue is empty.\n"); +static PyObject * +Connection_flush (Connection *self, PyObject *args UNUSED) +{ + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + dbus_connection_flush (self->conn); + Py_END_ALLOW_THREADS + Py_RETURN_NONE; +} + +/* Unsupported: + * dbus_connection_preallocate_send + * dbus_connection_free_preallocated_send + * dbus_connection_send_preallocated + * dbus_connection_borrow_message + * dbus_connection_return_message + * dbus_connection_steal_borrowed_message + * dbus_connection_pop_message + */ + +/* Non-main-loop handling not yet implemented: */ + /* dbus_connection_read_write_dispatch */ + /* dbus_connection_read_write */ + +/* Main loop handling not yet implemented: */ + /* dbus_connection_get_dispatch_status */ + /* dbus_connection_dispatch */ + /* dbus_connection_set_watch_functions */ + /* dbus_connection_set_timeout_functions */ + /* dbus_connection_set_wakeup_main_function */ + /* dbus_connection_set_dispatch_status_function */ + +/* Normally in Python this would be called fileno(), but I don't want to + * encourage people to select() on it */ +PyDoc_STRVAR(Connection_get_unix_fd__doc__, +"get_unix_fd() -> int or None\n\n" +"Get the connection's UNIX file descriptor, if any.\n\n" +"This can be used for SELinux access control checks with ``getpeercon()``\n" +"for example. **Do not** read or write to the file descriptor, or try to\n" +"``select()`` on it.\n"); +static PyObject * +Connection_get_unix_fd (Connection *self, PyObject *unused UNUSED) +{ + int fd; + dbus_bool_t ok; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_get_unix_fd (self->conn, &fd); + Py_END_ALLOW_THREADS + if (!ok) Py_RETURN_NONE; + return NATIVEINT_FROMLONG(fd); +} + +PyDoc_STRVAR(Connection_get_peer_unix_user__doc__, +"get_peer_unix_user() -> long or None\n\n" +"Get the UNIX user ID at the other end of the connection, if it has been\n" +"authenticated. Return None if this is a non-UNIX platform or the\n" +"connection has not been authenticated.\n"); +static PyObject * +Connection_get_peer_unix_user (Connection *self, PyObject *unused UNUSED) +{ + unsigned long uid; + dbus_bool_t ok; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_get_unix_user (self->conn, &uid); + Py_END_ALLOW_THREADS + if (!ok) Py_RETURN_NONE; + return PyLong_FromUnsignedLong (uid); +} + +PyDoc_STRVAR(Connection_get_peer_unix_process_id__doc__, +"get_peer_unix_process_id() -> long or None\n\n" +"Get the UNIX process ID at the other end of the connection, if it has been\n" +"authenticated. Return None if this is a non-UNIX platform or the\n" +"connection has not been authenticated.\n"); +static PyObject * +Connection_get_peer_unix_process_id (Connection *self, PyObject *unused UNUSED) +{ + unsigned long pid; + dbus_bool_t ok; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_get_unix_process_id (self->conn, &pid); + Py_END_ALLOW_THREADS + if (!ok) Py_RETURN_NONE; + return PyLong_FromUnsignedLong (pid); +} + +/* TODO: wrap dbus_connection_set_unix_user_function Pythonically */ + +PyDoc_STRVAR(Connection_add_message_filter__doc__, +"add_message_filter(callable)\n\n" +"Add the given message filter to the internal list.\n\n" +"Filters are handlers that are run on all incoming messages, prior to the\n" +"objects registered to handle object paths.\n" +"\n" +"Filters are run in the order that they were added. The same handler can\n" +"be added as a filter more than once, in which case it will be run more\n" +"than once. Filters added during a filter callback won't be run on the\n" +"message being processed.\n" +); +static PyObject * +Connection_add_message_filter(Connection *self, PyObject *callable) +{ + dbus_bool_t ok; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + /* The callable must be referenced by ->filters *before* it is + * given to libdbus, which does not own a reference to it. + */ + if (PyList_Append(self->filters, callable) < 0) { + return NULL; + } + + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_add_filter(self->conn, _filter_message, callable, + NULL); + Py_END_ALLOW_THREADS + + if (!ok) { + Py_XDECREF(PyObject_CallMethod(self->filters, "remove", "(O)", + callable)); + PyErr_NoMemory(); + return NULL; + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Connection_remove_message_filter__doc__, +"remove_message_filter(callable)\n\n" +"Remove the given message filter (see `add_message_filter` for details).\n" +"\n" +":Raises LookupError:\n" +" The given callable is not among the registered filters\n"); +static PyObject * +Connection_remove_message_filter(Connection *self, PyObject *callable) +{ + PyObject *obj; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + /* It's safe to do this before removing it from libdbus, because + * the presence of callable in our arguments means we have a ref + * to it. */ + obj = PyObject_CallMethod(self->filters, "remove", "(O)", callable); + if (!obj) return NULL; + Py_CLEAR(obj); + + Py_BEGIN_ALLOW_THREADS + dbus_connection_remove_filter(self->conn, _filter_message, callable); + Py_END_ALLOW_THREADS + + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Connection__register_object_path__doc__, +"register_object_path(path, on_message, on_unregister=None, fallback=False)\n" +"\n" +"Register a callback to be called when messages arrive at the given\n" +"object-path. Used to export objects' methods on the bus in a low-level\n" +"way. For the high-level interface to this functionality (usually\n" +"recommended) see the `dbus.service.Object` base class.\n" +"\n" +":Parameters:\n" +" `path` : str\n" +" Object path to be acted on\n" +" `on_message` : callable\n" +" Called when a message arrives at the given object-path, with\n" +" two positional parameters: the first is this Connection,\n" +" the second is the incoming `dbus.lowlevel.Message`.\n" +" `on_unregister` : callable or None\n" +" If not None, called when the callback is unregistered.\n" +" `fallback` : bool\n" +" If True (the default is False), when a message arrives for a\n" +" 'subdirectory' of the given path and there is no more specific\n" +" handler, use this handler. Normally this handler is only run if\n" +" the paths match exactly.\n" +); +static PyObject * +Connection__register_object_path(Connection *self, PyObject *args, + PyObject *kwargs) +{ + dbus_bool_t ok; + int fallback = 0; + char *path_bytes; + PyObject *callbacks, *path, *tuple, *on_message, *on_unregister = Py_None; + static char *argnames[] = {"path", "on_message", "on_unregister", + "fallback", NULL}; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!Connection__require_main_loop(self, NULL)) { + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "OO|Oi:_register_object_path", + argnames, + &path, + &on_message, &on_unregister, + &fallback)) return NULL; + + /* Take a reference to path, which we give away to libdbus in a moment. + + Also, path needs to be a string (not a subclass which could do something + mad) to preserve the desirable property that the DBusConnection can + never strongly reference the Connection, even indirectly. + */ + if (PyBytes_CheckExact(path)) { + Py_INCREF(path); + } + else if (PyUnicode_Check(path)) { + path = PyUnicode_AsUTF8String(path); + if (!path) return NULL; + } + else if (PyBytes_Check(path)) { + path = PyBytes_FromString(PyBytes_AS_STRING(path)); + if (!path) return NULL; + } + else { + PyErr_SetString(PyExc_TypeError, + "path must be a str, bytes, or unicode object"); + return NULL; + } + + path_bytes = PyBytes_AS_STRING(path); + if (!dbus_py_validate_object_path(path_bytes)) { + Py_CLEAR(path); + return NULL; + } + + tuple = Py_BuildValue("(OO)", on_unregister, on_message); + if (!tuple) { + Py_CLEAR(path); + return NULL; + } + + /* Guard against registering a handler that already exists. */ + callbacks = PyDict_GetItem(self->object_paths, path); + if (callbacks && callbacks != Py_None) { + PyErr_Format(PyExc_KeyError, "Can't register the object-path " + "handler for '%s': there is already a handler", + path_bytes); + Py_CLEAR(tuple); + Py_CLEAR(path); + return NULL; + } + + /* Pre-allocate a slot in the dictionary, so we know we'll be able + * to replace it with the callbacks without OOM. + * This ensures we can keep libdbus' opinion of whether those + * paths are handled in sync with our own. */ + if (PyDict_SetItem(self->object_paths, path, Py_None) < 0) { + Py_CLEAR(tuple); + Py_CLEAR(path); + return NULL; + } + + Py_BEGIN_ALLOW_THREADS + if (fallback) { + ok = dbus_connection_register_fallback(self->conn, + path_bytes, + &_object_path_vtable, + path); + } + else { + ok = dbus_connection_register_object_path(self->conn, + path_bytes, + &_object_path_vtable, + path); + } + Py_END_ALLOW_THREADS + + if (ok) { + if (PyDict_SetItem(self->object_paths, path, tuple) < 0) { + /* That shouldn't have happened, we already allocated enough + memory for it. Oh well, try to undo the registration to keep + things in sync. If this fails too, we've leaked a bit of + memory in libdbus, but tbh we should never get here anyway. */ + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_unregister_object_path(self->conn, + path_bytes); + Py_END_ALLOW_THREADS + return NULL; + } + /* don't DECREF path: libdbus owns a ref now */ + Py_CLEAR(tuple); + Py_RETURN_NONE; + } + else { + /* Oops, OOM. Tidy up, if we can, ignoring any error. */ + PyDict_DelItem(self->object_paths, path); + PyErr_Clear(); + Py_CLEAR(tuple); + Py_CLEAR(path); + PyErr_NoMemory(); + return NULL; + } +} + +PyDoc_STRVAR(Connection__unregister_object_path__doc__, +"unregister_object_path(path)\n\n" +"Remove a previously registered handler for the given object path.\n" +"\n" +":Parameters:\n" +" `path` : str\n" +" The object path whose handler is to be removed\n" +":Raises KeyError: if there is no handler registered for exactly that\n" +" object path.\n" +); +static PyObject * +Connection__unregister_object_path(Connection *self, PyObject *args, + PyObject *kwargs) +{ + dbus_bool_t ok; + char *path_bytes; + PyObject *path; + PyObject *callbacks; + static char *argnames[] = {"path", NULL}; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "O:_unregister_object_path", + argnames, &path)) return NULL; + + /* Take a ref to the path. Same comments as for _register_object_path. */ + if (PyBytes_CheckExact(path)) { + Py_INCREF(path); + } + else if (PyUnicode_Check(path)) { + path = PyUnicode_AsUTF8String(path); + if (!path) return NULL; + } + else if (PyBytes_Check(path)) { + path = PyBytes_FromString(PyBytes_AS_STRING(path)); + if (!path) return NULL; + } + else { + PyErr_SetString(PyExc_TypeError, + "path must be a str, bytes, or unicode object"); + return NULL; + } + + path_bytes = PyBytes_AS_STRING(path); + + /* Guard against unregistering a handler that doesn't, in fact, exist, + or whose unregistration is already in progress. */ + callbacks = PyDict_GetItem(self->object_paths, path); + if (!callbacks || callbacks == Py_None) { + PyErr_Format(PyExc_KeyError, "Can't unregister the object-path " + "handler for '%s': there is no such handler", + path_bytes); + Py_CLEAR(path); + return NULL; + } + + /* Hang on to a reference to the callbacks for the moment. */ + Py_INCREF(callbacks); + + /* Get rid of the object-path while we still have the GIL, to + guard against unregistering twice from different threads (which + causes undefined behaviour in libdbus). + + Because deletion would make it possible for the re-insertion below + to fail, we instead set the handler to None as a placeholder. + */ + if (PyDict_SetItem(self->object_paths, path, Py_None) < 0) { + /* If that failed, there's no need to be paranoid as below - the + callbacks are still set, so we failed, but at least everything + is in sync. */ + Py_CLEAR(callbacks); + Py_CLEAR(path); + return NULL; + } + + /* BEGIN PARANOIA + This is something of a critical section - the dict of object-paths + and libdbus' internal structures are out of sync for a bit. We have + to be able to cope with that. + + It's really annoying that dbus_connection_unregister_object_path + can fail, *and* has undefined behaviour if the object path has + already been unregistered. Either/or would be fine. + */ + + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_unregister_object_path(self->conn, path_bytes); + Py_END_ALLOW_THREADS + + if (ok) { + Py_CLEAR(callbacks); + PyDict_DelItem(self->object_paths, path); + /* END PARANOIA on successful code path */ + /* The above can't fail unless by some strange trickery the key is no + longer present. Ignore any errors. */ + Py_CLEAR(path); + PyErr_Clear(); + Py_RETURN_NONE; + } + else { + /* Oops, OOM. Put the callbacks back in the dict so + * we'll have another go if/when the user frees some memory + * and tries calling this method again. */ + PyDict_SetItem(self->object_paths, path, callbacks); + /* END PARANOIA on failing code path */ + /* If the SetItem failed, there's nothing we can do about it - but + since we know it's an existing entry, it shouldn't be able to fail + anyway. */ + Py_CLEAR(path); + Py_CLEAR(callbacks); + return PyErr_NoMemory(); + } +} + +PyDoc_STRVAR(Connection_list_exported_child_objects__doc__, +"list_exported_child_objects(path: str) -> list of str\n\n" +"Return a list of the names of objects exported on this Connection as\n" +"direct children of the given object path.\n" +"\n" +"Each name returned may be converted to a valid object path using\n" +"``dbus.ObjectPath('%s%s%s' % (path, (path != '/' and '/' or ''), name))``.\n" +"For the purposes of this function, every parent or ancestor of an exported\n" +"object is considered to be an exported object, even if it's only an object\n" +"synthesized by the library to support introspection.\n"); +static PyObject * +Connection_list_exported_child_objects (Connection *self, PyObject *args, + PyObject *kwargs) +{ + const char *path; + char **kids, **kid_ptr; + dbus_bool_t ok; + PyObject *ret; + static char *argnames[] = {"path", NULL}; + + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", argnames, &path)) { + return NULL; + } + + if (!dbus_py_validate_object_path(path)) { + return NULL; + } + + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_list_registered(self->conn, path, &kids); + Py_END_ALLOW_THREADS + + if (!ok) { + return PyErr_NoMemory(); + } + + ret = PyList_New(0); + if (!ret) { + return NULL; + } + for (kid_ptr = kids; *kid_ptr; kid_ptr++) { + PyObject *tmp = NATIVESTR_FROMSTR(*kid_ptr); + + if (!tmp) { + Py_CLEAR(ret); + return NULL; + } + if (PyList_Append(ret, tmp) < 0) { + Py_CLEAR(tmp); + Py_CLEAR(ret); + return NULL; + } + Py_CLEAR(tmp); + } + + dbus_free_string_array(kids); + + return ret; +} + + /* dbus_connection_get_object_path_data - not useful to Python, + * the object path data is just a PyBytes containing the path */ + /* dbus_connection_list_registered could be useful, though */ + +/* dbus_connection_set_change_sigpipe - sets global state */ + +/* Maxima. Does Python code ever need to manipulate these? + * OTOH they're easy to wrap */ + /* dbus_connection_set_max_message_size */ + /* dbus_connection_get_max_message_size */ + /* dbus_connection_set_max_received_size */ + /* dbus_connection_get_max_received_size */ + +/* dbus_connection_get_outgoing_size - almost certainly unneeded */ + +PyDoc_STRVAR(new_for_bus__doc__, +"Connection._new_for_bus([address: str or int]) -> Connection\n" +"\n" +"If the address is an int it must be one of the constants BUS_SESSION,\n" +"BUS_SYSTEM, BUS_STARTER; if a string, it must be a D-Bus address.\n" +"The default is BUS_SESSION.\n" +); + +PyDoc_STRVAR(get_unique_name__doc__, +"get_unique_name() -> str\n\n" +"Return this application's unique name on this bus.\n" +"\n" +":Raises DBusException: if the connection has no unique name yet\n" +" (for Bus objects this can't happen, for peer-to-peer connections\n" +" this means you haven't called `set_unique_name`)\n"); + +PyDoc_STRVAR(set_unique_name__doc__, +"set_unique_name(str)\n\n" +"Set this application's unique name on this bus. Raise ValueError if it has\n" +"already been set.\n"); + +struct PyMethodDef DBusPyConnection_tp_methods[] = { +#define ENTRY(name, flags) {#name, (PyCFunction)Connection_##name, flags, Connection_##name##__doc__} + ENTRY(_require_main_loop, METH_NOARGS), + ENTRY(close, METH_NOARGS), + ENTRY(flush, METH_NOARGS), + ENTRY(get_is_connected, METH_NOARGS), + ENTRY(get_is_authenticated, METH_NOARGS), + ENTRY(set_exit_on_disconnect, METH_VARARGS), + ENTRY(get_unix_fd, METH_NOARGS), + ENTRY(get_peer_unix_user, METH_NOARGS), + ENTRY(get_peer_unix_process_id, METH_NOARGS), + ENTRY(add_message_filter, METH_O), + ENTRY(_register_object_path, METH_VARARGS|METH_KEYWORDS), + ENTRY(remove_message_filter, METH_O), + ENTRY(send_message, METH_VARARGS), + ENTRY(send_message_with_reply, METH_VARARGS|METH_KEYWORDS), + ENTRY(send_message_with_reply_and_block, METH_VARARGS), + ENTRY(_unregister_object_path, METH_VARARGS|METH_KEYWORDS), + ENTRY(list_exported_child_objects, METH_VARARGS|METH_KEYWORDS), + {"_new_for_bus", (PyCFunction)DBusPyConnection_NewForBus, + METH_CLASS|METH_VARARGS|METH_KEYWORDS, + new_for_bus__doc__}, + {"get_unique_name", (PyCFunction)DBusPyConnection_GetUniqueName, + METH_NOARGS, + get_unique_name__doc__}, + {"set_unique_name", (PyCFunction)DBusPyConnection_SetUniqueName, + METH_VARARGS, + set_unique_name__doc__}, + ENTRY(set_allow_anonymous, METH_VARARGS), + {NULL}, +#undef ENTRY +}; + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/conn.c b/_dbus_bindings/conn.c new file mode 100644 index 0000000..9ef1487 --- /dev/null +++ b/_dbus_bindings/conn.c @@ -0,0 +1,502 @@ +/* Implementation of the _dbus_bindings Connection type, a Python wrapper + * for DBusConnection. See also conn-methods.c. + * + * Copyright (C) 2006-2008 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include "conn-internal.h" + +/* Connection definition ============================================ */ + +PyDoc_STRVAR(Connection_tp_doc, +"A D-Bus connection.\n" +"\n" +"::\n" +"\n" +" Connection(address, mainloop=None) -> Connection\n" +); + +/* D-Bus Connection user data slot, containing an owned reference to either + * the Connection, or a weakref to the Connection. + */ +static dbus_int32_t _connection_python_slot; + +/* C API for main-loop hooks ======================================== */ + +/* Return a borrowed reference to the DBusConnection which underlies this + * Connection. */ +DBusConnection * +DBusPyConnection_BorrowDBusConnection(PyObject *self) +{ + DBusConnection *dbc; + + TRACE(self); + if (!DBusPyConnection_Check(self)) { + PyErr_SetString(PyExc_TypeError, "A dbus.Connection is required"); + return NULL; + } + dbc = ((Connection *)self)->conn; + if (!dbc) { + PyErr_SetString(PyExc_RuntimeError, "Connection is in an invalid " + "state: no DBusConnection"); + return NULL; + } + return dbc; +} + +/* Internal C API =================================================== */ + +/* Pass a message through a handler. */ +DBusHandlerResult +DBusPyConnection_HandleMessage(Connection *conn, + PyObject *msg, + PyObject *callable) +{ + PyObject *obj; + + TRACE(conn); + obj = PyObject_CallFunctionObjArgs(callable, conn, msg, + NULL); + if (obj == Py_None) { + DBG("%p: OK, handler %p returned None", conn, callable); + Py_CLEAR(obj); + return DBUS_HANDLER_RESULT_HANDLED; + } + else if (obj == Py_NotImplemented) { + DBG("%p: handler %p returned NotImplemented, continuing", + conn, callable); + Py_CLEAR(obj); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + else if (!obj) { + if (PyErr_ExceptionMatches(PyExc_MemoryError)) { + DBG_EXC("%p: handler %p caused OOM", conn, callable); + PyErr_Clear(); + return DBUS_HANDLER_RESULT_NEED_MEMORY; + } + DBG_EXC("%p: handler %p raised exception", conn, callable); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + else { + long i = PyLong_AsLong(obj); + DBG("%p: handler %p returned %ld", conn, callable, i); + Py_CLEAR(obj); + if (i == -1 && PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError, "Return from D-Bus message " + "handler callback should be None, " + "NotImplemented or integer"); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + else if (i == DBUS_HANDLER_RESULT_HANDLED || + i == DBUS_HANDLER_RESULT_NOT_YET_HANDLED || + i == DBUS_HANDLER_RESULT_NEED_MEMORY) { + return i; + } + else { + PyErr_Format(PyExc_ValueError, "Integer return from " + "D-Bus message handler callback should " + "be a DBUS_HANDLER_RESULT_... constant, " + "not %d", (int)i); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + } +} + +/* On KeyError or if unregistration is in progress, return None. */ +PyObject * +DBusPyConnection_GetObjectPathHandlers(PyObject *self, PyObject *path) +{ + PyObject *callbacks; + + TRACE(self); + callbacks = PyDict_GetItem(((Connection *)self)->object_paths, path); + if (!callbacks) { + if (PyErr_ExceptionMatches(PyExc_KeyError)) { + PyErr_Clear(); + Py_RETURN_NONE; + } + } + Py_INCREF(callbacks); + return callbacks; +} + +/* Return a new reference to a Python Connection or subclass corresponding + * to the DBusConnection conn. For use in callbacks. + * + * Raises AssertionError if the DBusConnection does not have a Connection. + */ +PyObject * +DBusPyConnection_ExistingFromDBusConnection(DBusConnection *conn) +{ + PyObject *self, *ref; + + Py_BEGIN_ALLOW_THREADS + ref = (PyObject *)dbus_connection_get_data(conn, + _connection_python_slot); + Py_END_ALLOW_THREADS + if (ref) { + DBG("(DBusConnection *)%p has weak reference at %p", conn, ref); + self = PyWeakref_GetObject(ref); /* still a borrowed ref */ + if (self && self != Py_None && DBusPyConnection_Check(self)) { + DBG("(DBusConnection *)%p has weak reference at %p pointing to %p", + conn, ref, self); + TRACE(self); + Py_INCREF(self); + TRACE(self); + return self; + } + } + + PyErr_SetString(PyExc_AssertionError, + "D-Bus connection does not have a Connection " + "instance associated with it"); + return NULL; +} + +/* Return a new reference to a Python Connection or subclass (given by cls) + * corresponding to the DBusConnection conn, which must have been newly + * created. For use by the Connection and Bus constructors. + * + * Raises AssertionError if the DBusConnection already has a Connection. + */ +static PyObject * +DBusPyConnection_NewConsumingDBusConnection(PyTypeObject *cls, + DBusConnection *conn, + PyObject *mainloop) +{ + Connection *self = NULL; + PyObject *ref; + dbus_bool_t ok; + + DBG("%s(cls=%p, conn=%p, mainloop=%p)", __func__, cls, conn, mainloop); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(conn); + + Py_BEGIN_ALLOW_THREADS + ref = (PyObject *)dbus_connection_get_data(conn, + _connection_python_slot); + Py_END_ALLOW_THREADS + if (ref) { + self = (Connection *)PyWeakref_GetObject(ref); + ref = NULL; + if (self && (PyObject *)self != Py_None) { + self = NULL; + PyErr_SetString(PyExc_AssertionError, + "Newly created D-Bus connection already has a " + "Connection instance associated with it"); + DBG("%s() fail - assertion failed, DBusPyConn has a DBusConn already", __func__); + DBG_WHEREAMI; + return NULL; + } + } + ref = NULL; + + /* Change mainloop from a borrowed reference to an owned reference */ + if (!mainloop || mainloop == Py_None) { + mainloop = dbus_py_get_default_main_loop(); + if (!mainloop) + goto err; + } + else { + Py_INCREF(mainloop); + } + + DBG("Constructing Connection from DBusConnection at %p", conn); + + self = (Connection *)(cls->tp_alloc(cls, 0)); + if (!self) goto err; + TRACE(self); + + DBG_WHEREAMI; + + self->has_mainloop = (mainloop != Py_None); + self->conn = NULL; + self->filters = PyList_New(0); + self->weaklist = NULL; + if (!self->filters) goto err; + self->object_paths = PyDict_New(); + if (!self->object_paths) goto err; + + ref = PyWeakref_NewRef((PyObject *)self, NULL); + if (!ref) goto err; + DBG("Created weak ref %p to (Connection *)%p for (DBusConnection *)%p", + ref, self, conn); + + Py_BEGIN_ALLOW_THREADS + ok = dbus_connection_set_data(conn, _connection_python_slot, + (void *)ref, + (DBusFreeFunction)dbus_py_take_gil_and_xdecref); + Py_END_ALLOW_THREADS + + if (ok) { + DBG("Attached weak ref %p ((Connection *)%p) to (DBusConnection *)%p", + ref, self, conn); + ref = NULL; /* don't DECREF it - the DBusConnection owns it now */ + } + else { + DBG("Failed to attached weak ref %p ((Connection *)%p) to " + "(DBusConnection *)%p - will dispose of it", ref, self, conn); + PyErr_NoMemory(); + goto err; + } + + DBUS_PY_RAISE_VIA_GOTO_IF_FAIL(conn, err); + self->conn = conn; + /* the DBusPyConnection will close it now */ + conn = NULL; + + if (self->has_mainloop + && !dbus_py_set_up_connection((PyObject *)self, mainloop)) { + goto err; + } + + Py_CLEAR(mainloop); + + DBG("%s() -> %p", __func__, self); + TRACE(self); + return (PyObject *)self; + +err: + DBG("Failed to construct Connection from DBusConnection at %p", conn); + Py_CLEAR(mainloop); + Py_CLEAR(self); + Py_CLEAR(ref); + if (conn) { + Py_BEGIN_ALLOW_THREADS + dbus_connection_close(conn); + dbus_connection_unref(conn); + Py_END_ALLOW_THREADS + } + DBG("%s() fail", __func__); + DBG_WHEREAMI; + return NULL; +} + +/* Connection type-methods ========================================== */ + +/* Constructor */ +static PyObject * +Connection_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + DBusConnection *conn; + PyObject *address_or_conn; + DBusError error; + PyObject *self, *mainloop = NULL; + static char *argnames[] = {"address", "mainloop", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O", argnames, + &address_or_conn, &mainloop)) { + return NULL; + } + + if (DBusPyLibDBusConnection_CheckExact(address_or_conn)) { + DBusPyLibDBusConnection *wrapper = + (DBusPyLibDBusConnection *) address_or_conn; + + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(wrapper->conn); + + conn = dbus_connection_ref (wrapper->conn); + } + else if (PyBytes_Check(address_or_conn)) { + const char *address = PyBytes_AS_STRING(address_or_conn); + + dbus_error_init(&error); + + /* We always open a private connection (at the libdbus level). Sharing + * is done in Python, to keep things simple. */ + Py_BEGIN_ALLOW_THREADS + conn = dbus_connection_open_private(address, &error); + Py_END_ALLOW_THREADS + + if (!conn) { + DBusPyException_ConsumeError(&error); + return NULL; + } + } + else if (PyUnicode_Check(address_or_conn)) { + PyObject *address_as_bytes = PyUnicode_AsUTF8String(address_or_conn); + const char *address; + + if (!address_as_bytes) + return NULL; + address = PyBytes_AS_STRING(address_as_bytes); + + dbus_error_init(&error); + + /* We always open a private connection (at the libdbus level). Sharing + * is done in Python, to keep things simple. */ + Py_BEGIN_ALLOW_THREADS + conn = dbus_connection_open_private(address, &error); + Py_END_ALLOW_THREADS + + Py_CLEAR(address_as_bytes); + if (!conn) { + DBusPyException_ConsumeError(&error); + return NULL; + } + } + else { + PyErr_SetString(PyExc_TypeError, "connection or str expected"); + return NULL; + } + + self = DBusPyConnection_NewConsumingDBusConnection(cls, conn, mainloop); + TRACE(self); + + return self; +} + +/* Post-construction: nothing to do (but don't chain up to object.__init__, + * which takes no arguments and does nothing) */ +static int +Connection_tp_init(PyObject *self UNUSED, PyObject *args UNUSED, + PyObject *kwargs UNUSED) +{ + return 0; +} + +/* Destructor */ +static void Connection_tp_dealloc(Connection *self) +{ + DBusConnection *conn = self->conn; + PyObject *et, *ev, *etb; + PyObject *filters = self->filters; + PyObject *object_paths = self->object_paths; + + /* avoid clobbering any pending exception */ + PyErr_Fetch(&et, &ev, &etb); + + if (self->weaklist) { + PyObject_ClearWeakRefs((PyObject *)self); + } + + TRACE(self); + DBG("Deallocating Connection at %p (DBusConnection at %p)", self, conn); + DBG_WHEREAMI; + + DBG("Connection at %p: deleting callbacks", self); + self->filters = NULL; + Py_CLEAR(filters); + self->object_paths = NULL; + Py_CLEAR(object_paths); + + if (conn) { + /* Might trigger callbacks if we're unlucky... */ + DBG("Connection at %p has a conn, closing it...", self); + Py_BEGIN_ALLOW_THREADS + dbus_connection_close(conn); + Py_END_ALLOW_THREADS + } + + /* make sure to do this last to preserve the invariant that + * self->conn is always non-NULL for any referenced Connection + * (until the filters and object paths were freed, we might have been + * in a reference cycle!) + */ + DBG("Connection at %p: nulling self->conn", self); + self->conn = NULL; + + if (conn) { + DBG("Connection at %p: unreffing conn", self); + dbus_connection_unref(conn); + } + + DBG("Connection at %p: freeing self", self); + PyErr_Restore(et, ev, etb); + (Py_TYPE(self)->tp_free)((PyObject *)self); +} + +/* Connection type object =========================================== */ + +PyTypeObject DBusPyConnection_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_dbus_bindings.Connection", /*tp_name*/ + sizeof(Connection), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)Connection_tp_dealloc, + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ +#ifdef PY3 + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, +#else + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS | Py_TPFLAGS_BASETYPE, +#endif + Connection_tp_doc, /*tp_doc*/ + 0, /*tp_traverse*/ + 0, /*tp_clear*/ + 0, /*tp_richcompare*/ + offsetof(Connection, weaklist), /*tp_weaklistoffset*/ + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + DBusPyConnection_tp_methods, /*tp_methods*/ + 0, /*tp_members*/ + 0, /*tp_getset*/ + 0, /*tp_base*/ + 0, /*tp_dict*/ + 0, /*tp_descr_get*/ + 0, /*tp_descr_set*/ + 0, /*tp_dictoffset*/ + Connection_tp_init, /*tp_init*/ + 0, /*tp_alloc*/ + Connection_tp_new, /*tp_new*/ + 0, /*tp_free*/ + 0, /*tp_is_gc*/ +}; + +dbus_bool_t +dbus_py_init_conn_types(void) +{ + /* Get a slot to store our weakref on DBus Connections */ + _connection_python_slot = -1; + if (!dbus_connection_allocate_data_slot(&_connection_python_slot)) + return FALSE; + if (PyType_Ready(&DBusPyConnection_Type) < 0) + return FALSE; + return TRUE; +} + +dbus_bool_t +dbus_py_insert_conn_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF (&DBusPyConnection_Type); + if (PyModule_AddObject(this_module, "Connection", + (PyObject *)&DBusPyConnection_Type) < 0) return FALSE; + return TRUE; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/containers.c b/_dbus_bindings/containers.c new file mode 100644 index 0000000..e364f98 --- /dev/null +++ b/_dbus_bindings/containers.c @@ -0,0 +1,825 @@ +/* D-Bus container types: Array, Dict and Struct. + * + * Copyright (C) 2006-2007 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include +#include + +#include "types-internal.h" + +/* Array ============================================================ */ + +PyDoc_STRVAR(Array_tp_doc, +"An array of similar items, implemented as a subtype of list.\n" +"\n" +"As currently implemented, an Array behaves just like a list, but\n" +"with the addition of a ``signature`` property set by the constructor;\n" +"conversion of its items to D-Bus types is only done when it's sent in\n" +"a Message. This might change in future so validation is done earlier.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Array([iterable][, signature][, variant_level])\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +"``signature`` is the D-Bus signature string for a single element of the\n" +"array, or None. If not None it must represent a single complete type, the\n" +"type of a single array item; the signature of the whole Array may be\n" +"obtained by prepending ``a`` to the given signature.\n" +"\n" +"If None (the default), when the Array is sent over\n" +"D-Bus, the item signature will be guessed from the first element.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an array, this is represented in Python by an\n" +" Array with variant_level==2.\n" +); + +static struct PyMemberDef Array_tp_members[] = { + {"signature", T_OBJECT, offsetof(DBusPyArray, signature), READONLY, + "The D-Bus signature of each element of this Array (a Signature " + "instance)"}, + {"variant_level", T_LONG, offsetof(DBusPyArray, variant_level), + READONLY, + "The number of nested variants wrapping the real data. " + "0 if not in a variant."}, + {NULL}, +}; + +static void +Array_tp_dealloc (DBusPyArray *self) +{ + Py_CLEAR(self->signature); + (PyList_Type.tp_dealloc)((PyObject *)self); +} + +static PyObject * +Array_tp_repr(DBusPyArray *self) +{ + PyObject *parent_repr = (PyList_Type.tp_repr)((PyObject *)self); + PyObject *sig_repr = PyObject_Repr(self->signature); + PyObject *my_repr = NULL; + long variant_level = self->variant_level; + + if (!parent_repr) goto finally; + if (!sig_repr) goto finally; + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, signature=%V, " + "variant_level=%ld)", + Py_TYPE(&self->super)->tp_name, + REPRV(parent_repr), + REPRV(sig_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V, signature=%V)", + Py_TYPE(&self->super)->tp_name, + REPRV(parent_repr), + REPRV(sig_repr)); + } +finally: + Py_CLEAR(parent_repr); + Py_CLEAR(sig_repr); + return my_repr; +} + +static PyObject * +Array_tp_new (PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *variant_level = NULL; + DBusPyArray *self = (DBusPyArray *)(PyList_Type.tp_new)(cls, args, kwargs); + + /* variant_level is immutable, so handle it in __new__ rather than + __init__ */ + if (!self) return NULL; + Py_INCREF(Py_None); + self->signature = Py_None; + self->variant_level = 0; + if (kwargs) { + variant_level = PyDict_GetItem(kwargs, dbus_py_variant_level_const); + } + if (variant_level) { + long new_variant_level = PyLong_AsLong(variant_level); + if (new_variant_level == -1 && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + self->variant_level = new_variant_level; + } + return (PyObject *)self; +} + +static int +Array_tp_init (DBusPyArray *self, PyObject *args, PyObject *kwargs) +{ + PyObject *obj = dbus_py_empty_tuple; + PyObject *signature = NULL; + PyObject *tuple; + PyObject *variant_level; + /* variant_level is accepted but ignored - it's immutable, so + * __new__ handles it */ + static char *argnames[] = {"iterable", "signature", "variant_level", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOO:__init__", argnames, + &obj, &signature, &variant_level)) { + return -1; + } + + /* convert signature from a borrowed ref of unknown type to an owned ref + of type Signature (or None) */ + if (!signature) signature = Py_None; + if (signature == Py_None + || PyObject_IsInstance(signature, (PyObject *)&DBusPySignature_Type)) { + Py_INCREF(signature); + } + else { + signature = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, + "(O)", signature); + if (!signature) return -1; + } + + if (signature != Py_None) { + const char *c_str; + PyObject *signature_as_bytes; + + if ( +#ifdef PY3 + !PyUnicode_Check(signature) +#else + !PyBytes_Check(signature) +#endif + ) + { + PyErr_SetString(PyExc_TypeError, "str expected"); + Py_CLEAR(signature); + return -1; + } +#ifdef PY3 + if (!(signature_as_bytes = PyUnicode_AsUTF8String(signature))) { + Py_CLEAR(signature); + return -1; + } +#else + signature_as_bytes = signature; + Py_INCREF(signature_as_bytes); +#endif + + c_str = PyBytes_AS_STRING(signature_as_bytes); + + if (!dbus_signature_validate_single(c_str, NULL)) { + Py_CLEAR(signature); + Py_CLEAR(signature_as_bytes); + PyErr_SetString(PyExc_ValueError, + "There must be exactly one complete type in " + "an Array's signature parameter"); + return -1; + } + Py_CLEAR(signature_as_bytes); + } + + tuple = Py_BuildValue("(O)", obj); + if (!tuple) { + Py_CLEAR(signature); + return -1; + } + if ((PyList_Type.tp_init)((PyObject *)self, tuple, NULL) < 0) { + Py_CLEAR(tuple); + Py_CLEAR(signature); + return -1; + } + Py_CLEAR(tuple); + + Py_CLEAR(self->signature); + self->signature = signature; + return 0; +} + +PyTypeObject DBusPyArray_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Array", + sizeof(DBusPyArray), + 0, + (destructor)Array_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + (reprfunc)Array_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Array_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + Array_tp_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Array_tp_init, /* tp_init */ + 0, /* tp_alloc */ + Array_tp_new, /* tp_new */ +}; + +/* Dict ============================================================= */ + +PyDoc_STRVAR(Dict_tp_doc, +"An mapping whose keys are similar and whose values are similar,\n" +"implemented as a subtype of dict.\n" +"\n" +"As currently implemented, a Dictionary behaves just like a dict, but\n" +"with the addition of a ``signature`` property set by the constructor;\n" +"conversion of its items to D-Bus types is only done when it's sent in\n" +"a Message. This may change in future so validation is done earlier.\n" +"\n" +"Constructor::\n" +"\n" +" Dictionary(mapping_or_iterable=(), signature=None, variant_level=0)\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +"``signature`` is either a string or None. If a string, it must consist\n" +"of exactly two complete type signatures, representing the 'key' type\n" +"(which must be a primitive type, i.e. one of \"bdginoqstuxy\")\n" +"and the 'value' type. The signature of the whole Dictionary will be\n" +"``a{xx}`` where ``xx`` is replaced by the given signature.\n" +"\n" +"If it is None (the default), when the Dictionary is sent over\n" +"D-Bus, the key and value signatures will be guessed from an arbitrary\n" +"element of the Dictionary.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an array of DICT_ENTRY, this is represented in\n" +" Python by a Dictionary with variant_level==2.\n" +); + +static struct PyMemberDef Dict_tp_members[] = { + {"signature", T_OBJECT, offsetof(DBusPyDict, signature), READONLY, + "The D-Bus signature of each key in this Dictionary, followed by " + "that of each value in this Dictionary, as a Signature instance."}, + {"variant_level", T_LONG, offsetof(DBusPyDict, variant_level), + READONLY, + "The number of nested variants wrapping the real data. " + "0 if not in a variant."}, + {NULL}, +}; + +static void +Dict_tp_dealloc (DBusPyDict *self) +{ + Py_CLEAR(self->signature); + (PyDict_Type.tp_dealloc)((PyObject *)self); +} + +static PyObject * +Dict_tp_repr(DBusPyDict *self) +{ + PyObject *parent_repr = (PyDict_Type.tp_repr)((PyObject *)self); + PyObject *sig_repr = PyObject_Repr(self->signature); + PyObject *my_repr = NULL; + long variant_level = self->variant_level; + + if (!parent_repr) goto finally; + if (!sig_repr) goto finally; + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, signature=%V, " + "variant_level=%ld)", + Py_TYPE(&self->super)->tp_name, + REPRV(parent_repr), + REPRV(sig_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V, signature=%V)", + Py_TYPE(&self->super)->tp_name, + REPRV(parent_repr), + REPRV(sig_repr)); + } +finally: + Py_CLEAR(parent_repr); + Py_CLEAR(sig_repr); + return my_repr; +} + +static PyObject * +Dict_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + DBusPyDict *self = (DBusPyDict *)(PyDict_Type.tp_new)(cls, args, kwargs); + PyObject *variant_level = NULL; + + /* variant_level is immutable, so handle it in __new__ rather than + __init__ */ + if (!self) return NULL; + Py_INCREF(Py_None); + self->signature = Py_None; + self->variant_level = 0; + if (kwargs) { + variant_level = PyDict_GetItem(kwargs, dbus_py_variant_level_const); + } + if (variant_level) { + long new_variant_level = PyLong_AsLong(variant_level); + + if (new_variant_level == -1 && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + self->variant_level = new_variant_level; + } + return (PyObject *)self; +} + +static int +Dict_tp_init(DBusPyDict *self, PyObject *args, PyObject *kwargs) +{ + PyObject *obj = dbus_py_empty_tuple; + PyObject *signature = NULL; + PyObject *tuple; + PyObject *variant_level; /* ignored here - __new__ uses it */ + static char *argnames[] = {"mapping_or_iterable", "signature", + "variant_level", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOO:__init__", argnames, + &obj, &signature, &variant_level)) { + return -1; + } + + /* convert signature from a borrowed ref of unknown type to an owned ref + of type Signature (or None) */ + if (!signature) signature = Py_None; + if (signature == Py_None + || PyObject_IsInstance(signature, (PyObject *)&DBusPySignature_Type)) { + Py_INCREF(signature); + } + else { + signature = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, + "(O)", signature); + if (!signature) return -1; + } + + if (signature != Py_None) { + const char *c_str; + PyObject *signature_as_bytes; + + if (!NATIVESTR_CHECK(signature)) { + PyErr_SetString(PyExc_TypeError, "str expected"); + Py_CLEAR(signature); + return -1; + } +#ifdef PY3 + if (!(signature_as_bytes = PyUnicode_AsUTF8String(signature))) { + Py_CLEAR(signature); + return -1; + } +#else + signature_as_bytes = signature; + Py_INCREF(signature_as_bytes); +#endif + + c_str = PyBytes_AS_STRING(signature_as_bytes); + switch (c_str[0]) { + case DBUS_TYPE_BYTE: + case DBUS_TYPE_BOOLEAN: + case DBUS_TYPE_INT16: + case DBUS_TYPE_UINT16: + case DBUS_TYPE_INT32: + case DBUS_TYPE_UINT32: + case DBUS_TYPE_INT64: + case DBUS_TYPE_UINT64: + case DBUS_TYPE_DOUBLE: +#ifdef WITH_DBUS_FLOAT32 + case DBUS_TYPE_FLOAT: +#endif +#ifdef DBUS_TYPE_UNIX_FD + case DBUS_TYPE_UNIX_FD: +#endif + case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: + case DBUS_TYPE_SIGNATURE: + break; + default: + Py_CLEAR(signature); + Py_CLEAR(signature_as_bytes); + PyErr_SetString(PyExc_ValueError, + "The key type in a Dictionary's signature " + "must be a primitive type"); + return -1; + } + + if (!dbus_signature_validate_single(c_str + 1, NULL)) { + Py_CLEAR(signature); + Py_CLEAR(signature_as_bytes); + PyErr_SetString(PyExc_ValueError, + "There must be exactly two complete types in " + "a Dictionary's signature parameter"); + return -1; + } + Py_CLEAR(signature_as_bytes); + } + + tuple = Py_BuildValue("(O)", obj); + if (!tuple) { + Py_CLEAR(signature); + return -1; + } + + if ((PyDict_Type.tp_init((PyObject *)self, tuple, NULL)) < 0) { + Py_CLEAR(tuple); + Py_CLEAR(signature); + return -1; + } + Py_CLEAR(tuple); + + Py_CLEAR(self->signature); + self->signature = signature; + return 0; +} + +PyTypeObject DBusPyDict_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Dictionary", + sizeof(DBusPyDict), + 0, + (destructor)Dict_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + (reprfunc)Dict_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Dict_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + Dict_tp_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Dict_tp_init, /* tp_init */ + 0, /* tp_alloc */ + Dict_tp_new, /* tp_new */ +}; + +/* Struct =========================================================== */ + +static PyObject *struct_signatures; + +PyDoc_STRVAR(Struct_tp_doc, +"An structure containing items of possibly distinct types.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Struct(iterable, signature=None, variant_level=0) -> Struct\n" +"\n" +"D-Bus structs may not be empty, so the iterable argument is required and\n" +"may not be an empty iterable.\n" +"\n" +"``signature`` is either None, or a string representing the contents of the\n" +"struct as one or more complete type signatures. The overall signature of\n" +"the struct will be the given signature enclosed in parentheses, ``()``.\n" +"\n" +"If the signature is None (default) it will be guessed\n" +"from the types of the items during construction.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a struct, this is represented in Python by a\n" +" Struct with variant_level==2.\n" +); + +static PyObject * +Struct_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (PyTuple_Type.tp_repr)((PyObject *)self); + PyObject *sig; + PyObject *sig_repr = NULL; + PyObject *key; + long variant_level; + PyObject *my_repr = NULL; + + if (!parent_repr) goto finally; + key = PyLong_FromVoidPtr(self); + if (!key) goto finally; + sig = PyDict_GetItem(struct_signatures, key); + Py_CLEAR(key); + if (!sig) sig = Py_None; + sig_repr = PyObject_Repr(sig); + if (!sig_repr) goto finally; + + variant_level = dbus_py_variant_level_get(self); + if (variant_level < 0) + goto finally; + + if (variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, signature=%V, " + "variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + REPRV(sig_repr), + variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V, signature=%V)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + REPRV(sig_repr)); + } + +finally: + Py_CLEAR(parent_repr); + Py_CLEAR(sig_repr); + return my_repr; +} + +static PyObject * +Struct_tp_new (PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *signature = NULL; + long variantness = 0; + PyObject *self, *key; + static char *argnames[] = {"signature", "variant_level", NULL}; + + if (PyTuple_Size(args) != 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes exactly one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|Ol:__new__", argnames, + &signature, &variantness)) { + return NULL; + } + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + + self = (PyTuple_Type.tp_new)(cls, args, NULL); + if (!self) + return NULL; + if (PyTuple_Size(self) < 1) { + PyErr_SetString(PyExc_ValueError, "D-Bus structs may not be empty"); + Py_CLEAR(self); + return NULL; + } + + if (!dbus_py_variant_level_set(self, variantness)) { + Py_CLEAR(self); + return NULL; + } + + /* convert signature from a borrowed ref of unknown type to an owned ref + of type Signature (or None) */ + if (!signature) signature = Py_None; + if (signature == Py_None + || PyObject_IsInstance(signature, (PyObject *)&DBusPySignature_Type)) { + Py_INCREF(signature); + } + else { + signature = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, + "(O)", signature); + if (!signature) { + Py_CLEAR(self); + return NULL; + } + } + + key = PyLong_FromVoidPtr(self); + if (!key) { + Py_CLEAR(self); + Py_CLEAR(signature); + return NULL; + } + if (PyDict_SetItem(struct_signatures, key, signature) < 0) { + Py_CLEAR(key); + Py_CLEAR(self); + Py_CLEAR(signature); + return NULL; + } + + Py_CLEAR(key); + Py_CLEAR(signature); + return self; +} + +static void +Struct_tp_dealloc(PyObject *self) +{ + PyObject *et, *ev, *etb, *key; + + dbus_py_variant_level_clear(self); + PyErr_Fetch(&et, &ev, &etb); + + key = PyLong_FromVoidPtr(self); + if (key) { + if (PyDict_GetItem(struct_signatures, key)) { + if (PyDict_DelItem(struct_signatures, key) < 0) { + /* should never happen */ + PyErr_WriteUnraisable(self); + } + } + Py_CLEAR(key); + } + else { + /* not enough memory to free all the memory... leak the signature, + * there's not much else we could do here */ + PyErr_WriteUnraisable(self); + } + + PyErr_Restore(et, ev, etb); + (PyTuple_Type.tp_dealloc)(self); +} + +static PyObject * +Struct_tp_getattro(PyObject *obj, PyObject *name) +{ + PyObject *key, *value; + +#ifdef PY3 + if (PyUnicode_CompareWithASCIIString(name, "signature")) + return dbus_py_variant_level_getattro(obj, name); +#else + if (PyBytes_Check(name)) { + Py_INCREF(name); + } + else if (PyUnicode_Check(name)) { + name = PyUnicode_AsEncodedString(name, NULL, NULL); + if (!name) { + return NULL; + } + } + else { + PyErr_SetString(PyExc_TypeError, "attribute name must be string"); + return NULL; + } + + if (strcmp(PyBytes_AS_STRING(name), "signature")) { + value = dbus_py_variant_level_getattro(obj, name); + Py_CLEAR(name); + return value; + } + Py_CLEAR(name); +#endif /* PY3 */ + + key = PyLong_FromVoidPtr(obj); + + if (!key) { + return NULL; + } + + value = PyDict_GetItem(struct_signatures, key); + Py_CLEAR(key); + + if (!value) + value = Py_None; + Py_INCREF(value); + return value; +} + +PyTypeObject DBusPyStruct_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Struct", + 0, + 0, + Struct_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + (reprfunc)Struct_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + Struct_tp_getattro, /* tp_getattro */ + dbus_py_immutable_setattro, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Struct_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Struct_tp_new, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_container_types(void) +{ + struct_signatures = PyDict_New(); + if (!struct_signatures) return 0; + + DBusPyArray_Type.tp_base = &PyList_Type; + if (PyType_Ready(&DBusPyArray_Type) < 0) return 0; + DBusPyArray_Type.tp_print = NULL; + + DBusPyDict_Type.tp_base = &PyDict_Type; + if (PyType_Ready(&DBusPyDict_Type) < 0) return 0; + DBusPyDict_Type.tp_print = NULL; + + DBusPyStruct_Type.tp_base = &PyTuple_Type; + if (PyType_Ready(&DBusPyStruct_Type) < 0) return 0; + DBusPyStruct_Type.tp_print = NULL; + + return 1; +} + +dbus_bool_t +dbus_py_insert_container_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF(&DBusPyArray_Type); + if (PyModule_AddObject(this_module, "Array", + (PyObject *)&DBusPyArray_Type) < 0) return 0; + + Py_INCREF(&DBusPyDict_Type); + if (PyModule_AddObject(this_module, "Dictionary", + (PyObject *)&DBusPyDict_Type) < 0) return 0; + + Py_INCREF(&DBusPyStruct_Type); + if (PyModule_AddObject(this_module, "Struct", + (PyObject *)&DBusPyStruct_Type) < 0) return 0; + + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ + diff --git a/_dbus_bindings/dbus_bindings-internal.h b/_dbus_bindings/dbus_bindings-internal.h new file mode 100644 index 0000000..b3006b5 --- /dev/null +++ b/_dbus_bindings/dbus_bindings-internal.h @@ -0,0 +1,296 @@ +/* _dbus_bindings internal API. For use within _dbus_bindings only. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef DBUS_BINDINGS_INTERNAL_H +#define DBUS_BINDINGS_INTERNAL_H + +#define PY_SSIZE_T_CLEAN 1 +#define PY_SIZE_T_CLEAN 1 + +#include + +#define INSIDE_DBUS_PYTHON_BINDINGS +#include "dbus/dbus-python.h" + +#if defined(__GNUC__) +# if __GNUC__ >= 3 +# define UNUSED __attribute__((__unused__)) +# define NORETURN __attribute__((__noreturn__)) +# else +# define UNUSED /*nothing*/ +# define NORETURN /*nothing*/ +# endif +#else +# define UNUSED /*nothing*/ +# define NORETURN /*nothing*/ +#endif + +/* no need for extern "C", this is only for internal use */ + +/* on/off switch for debugging support (see below) */ +#undef USING_DBG +#if 0 && !defined(DBG_IS_TOO_VERBOSE) +# define USING_DBG 1 +#endif + +#define DEFINE_CHECK(type) \ +static inline int type##_Check (PyObject *o) \ +{ \ + return (PyObject_TypeCheck (o, &type##_Type)); \ +} \ +static inline int type##_CheckExact (PyObject *o) \ +{ \ + return (Py_TYPE(o) == &type##_Type); \ +} + +/* This is a clever little trick to make writing the various object reprs + * easier. It relies on Python's %V format option which consumes two + * arguments. The first is a unicode object which may be NULL, and the second + * is a char* which will be used if the first parameter is NULL. + * + * The issue is that we don't know whether the `parent_repr` at the call site + * is a unicode or a bytes (a.k.a. 8-bit string). Under Python 3, it will + * always be a unicode. Under Python 2 it will *probably* be a bytes/str, but + * could potentially be a unicode. So, we check the type, and if it's a + * unicode, we pass that as the first argument, leaving NULL as the second + * argument (since it will never be checked). However, if the object is not a + * unicode, it better be a bytes. In that case, we'll pass NULL as the first + * argument so that the second one gets used, and we'll dig the char* out of + * the bytes object for that purpose. + * + * You might think that this would crash if obj is neither a bytes/str or + * unicode, and you'd be right *except* that Python doesn't allow any other + * types to be returned in the reprs. Also, since obj will always be the repr + * of a built-in type, it will never be anything other than a bytes or a + * unicode in any version of Python. So in practice, this is safe. + */ +#define REPRV(obj) \ + (PyUnicode_Check(obj) ? (obj) : NULL), \ + (PyUnicode_Check(obj) ? NULL : PyBytes_AS_STRING(obj)) + +#ifdef PY3 +#define NATIVEINT_TYPE (PyLong_Type) +#define NATIVEINT_FROMLONG(x) (PyLong_FromLong(x)) +#define NATIVEINT_ASLONG(x) (PyLong_AsLong(x)) +#define INTORLONG_CHECK(obj) (PyLong_Check(obj)) +#define NATIVESTR_TYPE (PyUnicode_Type) +#define NATIVESTR_CHECK(obj) (PyUnicode_Check(obj)) +#define NATIVESTR_FROMSTR(obj) (PyUnicode_FromString(obj)) +#else +#define NATIVEINT_TYPE (PyInt_Type) +#define NATIVEINT_FROMLONG(x) (PyInt_FromLong(x)) +#define NATIVEINT_ASLONG(x) (PyInt_AsLong(x)) +#define INTORLONG_CHECK(obj) (PyLong_Check(obj) || PyInt_Check(obj)) +#define NATIVESTR_TYPE (PyBytes_Type) +#define NATIVESTR_CHECK(obj) (PyBytes_Check(obj)) +#define NATIVESTR_FROMSTR(obj) (PyBytes_FromString(obj)) +#endif + +#ifdef PY3 +PyMODINIT_FUNC PyInit__dbus_bindings(void); +#else +PyMODINIT_FUNC init_dbus_bindings(void); +#endif + +/* conn.c */ +extern PyTypeObject DBusPyConnection_Type; +DEFINE_CHECK(DBusPyConnection) +extern dbus_bool_t dbus_py_init_conn_types(void); +extern dbus_bool_t dbus_py_insert_conn_types(PyObject *this_module); + +/* libdbusconn.c */ +extern PyTypeObject DBusPyLibDBusConnection_Type; +DEFINE_CHECK(DBusPyLibDBusConnection) +PyObject *DBusPyLibDBusConnection_New(DBusConnection *conn); +extern dbus_bool_t dbus_py_init_libdbus_conn_types(void); +extern dbus_bool_t dbus_py_insert_libdbus_conn_types(PyObject *this_module); + +/* bus.c */ +extern dbus_bool_t dbus_py_init_bus_types(void); +extern dbus_bool_t dbus_py_insert_bus_types(PyObject *this_module); + +/* exceptions.c */ +extern PyObject *DBusPyException_SetString(const char *msg); +extern PyObject *DBusPyException_ConsumeError(DBusError *error); +extern dbus_bool_t dbus_py_init_exception_types(void); +extern dbus_bool_t dbus_py_insert_exception_types(PyObject *this_module); + +/* types */ +extern PyTypeObject DBusPyBoolean_Type; +DEFINE_CHECK(DBusPyBoolean) +extern PyTypeObject DBusPyObjectPath_Type, DBusPySignature_Type; +DEFINE_CHECK(DBusPyObjectPath) +DEFINE_CHECK(DBusPySignature) +extern PyTypeObject DBusPyArray_Type, DBusPyDict_Type, DBusPyStruct_Type; +DEFINE_CHECK(DBusPyArray) +DEFINE_CHECK(DBusPyDict) +DEFINE_CHECK(DBusPyStruct) +extern PyTypeObject DBusPyByte_Type, DBusPyByteArray_Type; +DEFINE_CHECK(DBusPyByteArray) +DEFINE_CHECK(DBusPyByte) +extern PyTypeObject DBusPyString_Type; +DEFINE_CHECK(DBusPyString) +#ifndef PY3 +extern PyTypeObject DBusPyUTF8String_Type; +DEFINE_CHECK(DBusPyUTF8String) +#endif +extern PyTypeObject DBusPyDouble_Type; +DEFINE_CHECK(DBusPyDouble) +extern PyTypeObject DBusPyInt16_Type, DBusPyUInt16_Type; +DEFINE_CHECK(DBusPyInt16) +DEFINE_CHECK(DBusPyUInt16) +extern PyTypeObject DBusPyInt32_Type, DBusPyUInt32_Type; +DEFINE_CHECK(DBusPyInt32) +DEFINE_CHECK(DBusPyUInt32) +extern PyTypeObject DBusPyUnixFd_Type; +DEFINE_CHECK(DBusPyUnixFd) +extern PyTypeObject DBusPyInt64_Type, DBusPyUInt64_Type; +DEFINE_CHECK(DBusPyInt64) +DEFINE_CHECK(DBusPyUInt64) +extern dbus_bool_t dbus_py_init_abstract(void); +extern dbus_bool_t dbus_py_init_signature(void); +extern dbus_bool_t dbus_py_init_int_types(void); +extern dbus_bool_t dbus_py_init_unixfd_type(void); +extern dbus_bool_t dbus_py_init_string_types(void); +extern dbus_bool_t dbus_py_init_float_types(void); +extern dbus_bool_t dbus_py_init_container_types(void); +extern dbus_bool_t dbus_py_init_byte_types(void); +extern dbus_bool_t dbus_py_insert_abstract_types(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_signature(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_int_types(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_unixfd_type(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_string_types(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_float_types(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_container_types(PyObject *this_module); +extern dbus_bool_t dbus_py_insert_byte_types(PyObject *this_module); + +int dbus_py_unix_fd_get_fd(PyObject *self); + +/* generic */ +extern void dbus_py_take_gil_and_xdecref(PyObject *); +extern int dbus_py_immutable_setattro(PyObject *, PyObject *, PyObject *); +extern PyObject *dbus_py_empty_tuple; +extern dbus_bool_t dbus_py_init_generic(void); + +/* message.c */ +extern DBusMessage *DBusPyMessage_BorrowDBusMessage(PyObject *msg); +extern PyObject *DBusPyMessage_ConsumeDBusMessage(DBusMessage *); +extern dbus_bool_t dbus_py_init_message_types(void); +extern dbus_bool_t dbus_py_insert_message_types(PyObject *this_module); + +/* pending-call.c */ +extern PyObject *DBusPyPendingCall_ConsumeDBusPendingCall(DBusPendingCall *, + PyObject *); +extern dbus_bool_t dbus_py_init_pending_call(void); +extern dbus_bool_t dbus_py_insert_pending_call(PyObject *this_module); + +/* mainloop.c */ +extern dbus_bool_t dbus_py_set_up_connection(PyObject *conn, + PyObject *mainloop); +extern dbus_bool_t dbus_py_set_up_server(PyObject *server, + PyObject *mainloop); +extern PyObject *dbus_py_get_default_main_loop(void); +extern dbus_bool_t dbus_py_check_mainloop_sanity(PyObject *); +extern dbus_bool_t dbus_py_init_mainloop(void); +extern dbus_bool_t dbus_py_insert_mainloop_types(PyObject *); + +/* server.c */ +extern PyTypeObject DBusPyServer_Type; +DEFINE_CHECK(DBusPyServer) +extern dbus_bool_t dbus_py_init_server_types(void); +extern dbus_bool_t dbus_py_insert_server_types(PyObject *this_module); +extern DBusServer *DBusPyServer_BorrowDBusServer(PyObject *self); + +/* validation.c */ +dbus_bool_t dbus_py_validate_bus_name(const char *name, + dbus_bool_t may_be_unique, + dbus_bool_t may_be_not_unique); +dbus_bool_t dbus_py_validate_member_name(const char *name); +dbus_bool_t dbus_py_validate_interface_name(const char *name); +dbus_bool_t dbus_py_validate_object_path(const char *path); +#define dbus_py_validate_error_name dbus_py_validate_interface_name + +/* debugging support */ +void _dbus_py_assertion_failed(const char *) NORETURN; +#define DBUS_PY_RAISE_VIA_NULL_IF_FAIL(assertion) \ + do { if (!(assertion)) { \ + _dbus_py_assertion_failed(#assertion); \ + return NULL; \ + } \ + } while (0) + +#define DBUS_PY_RAISE_VIA_GOTO_IF_FAIL(assertion, label) \ + do { if (!(assertion)) { \ + _dbus_py_assertion_failed(#assertion); \ + goto label; \ + } \ + } while (0) + +#define DBUS_PY_RAISE_VIA_RETURN_IF_FAIL(assertion, value) \ + do { if (!(assertion)) { \ + _dbus_py_assertion_failed(#assertion); \ + return value; \ + } \ + } while (0) + +/* verbose debugging support */ +#ifdef USING_DBG + +# include +# include + +void _dbus_py_dbg_exc(void); +void _dbus_py_whereami(void); +void _dbus_py_dbg_dump_message(DBusMessage *); + +# define TRACE(self) do { \ + fprintf(stderr, "TRACE: <%s at %p> in %s, " \ + "%d refs\n", \ + self ? Py_TYPE(self)->tp_name : NULL, \ + self, __func__, \ + self ? (int)Py_REFCNT(self) : 0); \ + } while (0) +# define DBG(format, ...) fprintf(stderr, "DEBUG: " format "\n",\ + __VA_ARGS__) +# define DBG_EXC(format, ...) do {DBG(format, __VA_ARGS__); \ + _dbus_py_dbg_exc();} while (0) +# define DBG_DUMP_MESSAGE(x) _dbus_py_dbg_dump_message(x) +# define DBG_WHEREAMI _dbus_py_whereami() + +#else /* !defined(USING_DBG) */ + +# define TRACE(self) do {} while (0) +# define DBG(format, ...) do {} while (0) +# define DBG_EXC(format, ...) do {} while (0) +# define DBG_DUMP_MESSAGE(x) do {} while (0) +# define DBG_WHEREAMI do {} while (0) + +#endif /* !defined(USING_DBG) */ + +/* General-purpose Python glue */ + +#define DEFERRED_ADDRESS(ADDR) 0 + +#endif diff --git a/_dbus_bindings/debug.c b/_dbus_bindings/debug.c new file mode 100644 index 0000000..4620c86 --- /dev/null +++ b/_dbus_bindings/debug.c @@ -0,0 +1,96 @@ +/* Debug code for _dbus_bindings. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include + +void +_dbus_py_assertion_failed(const char *assertion) +{ + PyErr_SetString(PyExc_AssertionError, assertion); +#if 1 || defined(USING_DBG) || defined(FATAL_ASSERTIONS) + /* print the Python stack, and dump core so we can see the C stack too */ + PyErr_Print(); + abort(); +#endif +} + +#ifdef USING_DBG +void +_dbus_py_whereami(void) +{ + PyObject *c, *v, *t; + /* This is a little mad. We want to get the traceback without + clearing the error indicator, if any. */ + PyErr_Fetch(&c, &v, &t); /* 3 new refs */ + Py_XINCREF(c); Py_XINCREF(v); Py_XINCREF(t); /* now we own 6 refs */ + PyErr_Restore(c, v, t); /* steals 3 refs */ + + if (!PyErr_Occurred()) { + PyErr_SetString(PyExc_AssertionError, + "No error, but plz provide traceback kthx"); + } + PyErr_Print(); + + PyErr_Restore(c, v, t); /* steals another 3 refs */ +} + +void +_dbus_py_dbg_exc(void) +{ + PyObject *c, *v, *t; + /* This is a little mad. We want to get the traceback without + clearing the error indicator. */ + PyErr_Fetch(&c, &v, &t); /* 3 new refs */ + Py_XINCREF(c); Py_XINCREF(v); Py_XINCREF(t); /* now we own 6 refs */ + PyErr_Restore(c, v, t); /* steals 3 refs */ + PyErr_Print(); + PyErr_Restore(c, v, t); /* steals another 3 refs */ +} + +void +_dbus_py_dbg_dump_message(DBusMessage *message) +{ + const char *s; + fprintf(stderr, "DBusMessage at %p\n", message); + + s = dbus_message_get_destination(message); + if (!s) s = "(null)"; + fprintf(stderr, "\tdestination %s\n", s); + + s = dbus_message_get_interface(message); + if (!s) s = "(null)"; + fprintf(stderr, "\tinterface %s\n", s); + + s = dbus_message_get_member(message); + if (!s) s = "(null)"; + fprintf(stderr, "\tmember %s\n", s); + + s = dbus_message_get_path(message); + if (!s) s = "(null)"; + fprintf(stderr, "\tpath %s\n", s); +} +#endif diff --git a/_dbus_bindings/exceptions.c b/_dbus_bindings/exceptions.c new file mode 100644 index 0000000..6721f5c --- /dev/null +++ b/_dbus_bindings/exceptions.c @@ -0,0 +1,104 @@ +/* D-Bus exception base classes. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +static PyObject *imported_dbus_exception = NULL; + +static dbus_bool_t +import_exception(void) +{ + PyObject *name; + PyObject *exceptions; + + if (imported_dbus_exception != NULL) { + return TRUE; + } + + name = NATIVESTR_FROMSTR("dbus.exceptions"); + if (name == NULL) { + return FALSE; + } + exceptions = PyImport_Import(name); + Py_CLEAR(name); + if (exceptions == NULL) { + return FALSE; + } + imported_dbus_exception = PyObject_GetAttrString(exceptions, + "DBusException"); + Py_CLEAR(exceptions); + + return (imported_dbus_exception != NULL); +} + +PyObject * +DBusPyException_SetString(const char *msg) +{ + if (imported_dbus_exception != NULL || import_exception()) { + PyErr_SetString(imported_dbus_exception, msg); + } + return NULL; +} + +PyObject * +DBusPyException_ConsumeError(DBusError *error) +{ + PyObject *exc_value = NULL; + + if (imported_dbus_exception == NULL && !import_exception()) { + goto finally; + } + + exc_value = PyObject_CallFunction(imported_dbus_exception, + "s", + error->message ? error->message + : ""); + + if (!exc_value) { + goto finally; + } + + if (error->name) { + PyObject *name = NATIVESTR_FROMSTR(error->name); + int ret; + + if (!name) + goto finally; + ret = PyObject_SetAttrString(exc_value, "_dbus_error_name", name); + Py_CLEAR(name); + if (ret < 0) { + goto finally; + } + } + + PyErr_SetObject(imported_dbus_exception, exc_value); + +finally: + Py_CLEAR(exc_value); + dbus_error_free(error); + return NULL; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/float.c b/_dbus_bindings/float.c new file mode 100644 index 0000000..9d05c19 --- /dev/null +++ b/_dbus_bindings/float.c @@ -0,0 +1,156 @@ +/* Simple D-Bus types: Double and (with appropriate #defines) Float + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include +#include + +#include "types-internal.h" + +PyDoc_STRVAR(Double_tp_doc, +"A double-precision floating point number (a subtype of float)."); + +#ifdef WITH_DBUS_FLOAT32 +PyDoc_STRVAR(Float_tp_doc, +"A single-precision floating point number (a subtype of float)."); +#endif + +PyTypeObject DBusPyDouble_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Double", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Double_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPythonFloatType), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +#ifdef WITH_DBUS_FLOAT32 + +PyTypeObject DBusPyFloat_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Float", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Float_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPythonFloatType), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; +#endif /* defined(WITH_DBUS_FLOAT32) */ + +dbus_bool_t +dbus_py_init_float_types(void) +{ + DBusPyDouble_Type.tp_base = &DBusPyFloatBase_Type; + if (PyType_Ready(&DBusPyDouble_Type) < 0) return 0; + DBusPyDouble_Type.tp_print = NULL; + +#ifdef WITH_DBUS_FLOAT32 + DBusPyFloat_Type.tp_base = &DBusPyFloatBase_Type; + if (PyType_Ready(&DBusPyFloat_Type) < 0) return 0; + DBusPyFloat_Type.tp_print = NULL; +#endif + + return 1; +} + +dbus_bool_t +dbus_py_insert_float_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF(&DBusPyDouble_Type); + if (PyModule_AddObject(this_module, "Double", + (PyObject *)&DBusPyDouble_Type) < 0) return 0; +#ifdef WITH_DBUS_FLOAT32 + Py_INCREF(&DBusPyFloat_Type); + if (PyModule_AddObject(this_module, "Float", + (PyObject *)&DBusPyFloat_Type) < 0) return 0; +#endif + + return 1; +} diff --git a/_dbus_bindings/generic.c b/_dbus_bindings/generic.c new file mode 100644 index 0000000..ed12025 --- /dev/null +++ b/_dbus_bindings/generic.c @@ -0,0 +1,61 @@ +/* General Python glue code, used in _dbus_bindings but not actually anything + * to do with D-Bus. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +/* The empty tuple, held globally since dbus-python turns out to use it quite + * a lot + */ +PyObject *dbus_py_empty_tuple = NULL; + +int +dbus_py_immutable_setattro(PyObject *obj UNUSED, + PyObject *name UNUSED, + PyObject *value UNUSED) +{ + PyErr_SetString(PyExc_AttributeError, "Object is immutable"); + return -1; +} + +/* Take the global interpreter lock and decrement the reference count. + * Suitable for calling from a C callback. */ +void +dbus_py_take_gil_and_xdecref(PyObject *obj) +{ + PyGILState_STATE gil = PyGILState_Ensure(); + Py_CLEAR(obj); + PyGILState_Release(gil); +} + +dbus_bool_t +dbus_py_init_generic(void) +{ + dbus_py_empty_tuple = PyTuple_New(0); + if (!dbus_py_empty_tuple) return 0; + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/int.c b/_dbus_bindings/int.c new file mode 100644 index 0000000..66ad9e0 --- /dev/null +++ b/_dbus_bindings/int.c @@ -0,0 +1,804 @@ +/* Simple D-Bus types: integers of various sizes, and ObjectPath. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include "types-internal.h" + +#ifdef PY3 +#define INTBASE (DBusPyLongBase_Type) +#else +#define INTBASE (DBusPyIntBase_Type) +#endif + +/* Specific types =================================================== */ + +/* Boolean, a subclass of DBusPythonInt ============================= */ + +PyDoc_STRVAR(Boolean_tp_doc, +"A boolean, represented as a subtype of `int` (not `bool`, because `bool`\n" +"cannot be subclassed).\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Boolean(value[, variant_level]) -> Boolean\n" +"\n" +"``value`` is converted to 0 or 1 as if by ``int(bool(value))``.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a boolean, this is represented in Python by a\n" +" Boolean with variant_level==2.\n" +); + +static PyObject * +Boolean_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *tuple, *self, *value = Py_None; + long variantness = 0; + static char *argnames[] = {"_", "variant_level", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Ol:__new__", argnames, + &value, &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + tuple = Py_BuildValue("(i)", PyObject_IsTrue(value) ? 1 : 0); + if (!tuple) return NULL; + self = (INTBASE.tp_new)(cls, tuple, kwargs); + Py_CLEAR(tuple); + return self; +} + +static PyObject * +Boolean_tp_repr(PyObject *self) +{ + int is_true = PyObject_IsTrue(self); +#ifdef PY3 + long variant_level = dbus_py_variant_level_get(self); + if (variant_level < 0) + return NULL; +#else + long variant_level = ((DBusPyIntBase *)self)->variant_level; +#endif + + if (is_true == -1) + return NULL; + + if (variant_level > 0) { + return PyUnicode_FromFormat("%s(%s, variant_level=%ld)", + Py_TYPE(self)->tp_name, + is_true ? "True" : "False", + variant_level); + } + return PyUnicode_FromFormat("%s(%s)", + Py_TYPE(self)->tp_name, + is_true ? "True" : "False"); +} + +PyTypeObject DBusPyBoolean_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Boolean", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + Boolean_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Boolean_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&INTBASE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Boolean_tp_new, /* tp_new */ +}; + +/* Int16 ============================================================ */ + +PyDoc_STRVAR(Int16_tp_doc, +"A signed 16-bit integer between -0x8000 and +0x7FFF, represented as\n" +"a subtype of `int`.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Int16(value: int[, variant_level: int]) -> Int16\n" +"\n" +"value must be within the allowed range, or OverflowError will be\n" +"raised.\n" +"\n" +" variant_level must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an int16, this is represented in Python by an\n" +" Int16 with variant_level==2.\n" +); + +dbus_int16_t +dbus_py_int16_range_check(PyObject *obj) +{ + long i = PyLong_AsLong(obj); + if (i == -1 && PyErr_Occurred()) + return -1; + + if (i < -0x8000 || i > 0x7fff) { + PyErr_Format(PyExc_OverflowError, "Value %d out of range for Int16", + (int)i); + return -1; + } + return (dbus_int16_t)i; +} + +static PyObject * +Int16_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self = (INTBASE.tp_new)(cls, args, kwargs); + if (self && dbus_py_int16_range_check(self) == -1 && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + return self; +} + +PyTypeObject DBusPyInt16_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Int16", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Int16_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&INTBASE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Int16_tp_new, /* tp_new */ +}; + +/* UInt16 =========================================================== */ + +PyDoc_STRVAR(UInt16_tp_doc, +"An unsigned 16-bit integer between 0 and 0xFFFF, represented as\n" +"a subtype of `int`.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.UInt16(value: int[, variant_level: int]) -> UInt16\n" +"\n" +"``value`` must be within the allowed range, or `OverflowError` will be\n" +"raised.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a uint16, this is represented in Python by a\n" +" UInt16 with variant_level==2.\n" +); + +dbus_uint16_t +dbus_py_uint16_range_check(PyObject *obj) +{ + long i = PyLong_AsLong(obj); + if (i == -1 && PyErr_Occurred()) + return (dbus_uint16_t)(-1); + + if (i < 0 || i > 0xffff) { + PyErr_Format(PyExc_OverflowError, "Value %d out of range for UInt16", + (int)i); + return (dbus_uint16_t)(-1); + } + return (dbus_uint16_t)i; +} + +static PyObject * +UInt16_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self = (INTBASE.tp_new)(cls, args, kwargs); + if (self && dbus_py_uint16_range_check(self) == (dbus_uint16_t)(-1) + && PyErr_Occurred()) + { + Py_CLEAR (self); + return NULL; + } + return self; +} + +PyTypeObject DBusPyUInt16_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.UInt16", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + UInt16_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&INTBASE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + UInt16_tp_new, /* tp_new */ +}; + +/* Int32 ============================================================ */ + +PyDoc_STRVAR(Int32_tp_doc, +"A signed 32-bit integer between -0x8000 0000 and +0x7FFF FFFF, represented as\n" +"a subtype of `int`.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Int32(value: int[, variant_level: int]) -> Int32\n" +"\n" +"``value`` must be within the allowed range, or `OverflowError` will be\n" +"raised.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an int32, this is represented in Python by an\n" +" Int32 with variant_level==2.\n" +); + +dbus_int32_t +dbus_py_int32_range_check(PyObject *obj) +{ + long i = PyLong_AsLong(obj); + if (i == -1 && PyErr_Occurred()) + return -1; + + if (i < INT32_MIN || i > INT32_MAX) { + PyErr_Format(PyExc_OverflowError, "Value %d out of range for Int32", + (int)i); + return -1; + } + return (dbus_int32_t)i; +} + +static PyObject * +Int32_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self = (INTBASE.tp_new)(cls, args, kwargs); + if (self && dbus_py_int32_range_check(self) == -1 && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + return self; +} + +PyTypeObject DBusPyInt32_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Int32", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Int32_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&INTBASE), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Int32_tp_new, /* tp_new */ +}; + +/* UInt32 =========================================================== */ + +PyDoc_STRVAR(UInt32_tp_doc, +"An unsigned 32-bit integer between 0 and 0xFFFF FFFF, represented as a\n" +"subtype of `long`.\n" +"\n" +"Note that this may be changed in future to be a subtype of `int` on\n" +"64-bit platforms; applications should not rely on either behaviour.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.UInt32(value: long[, variant_level: int]) -> UInt32\n" +"\n" +"``value`` must be within the allowed range, or `OverflowError` will be\n" +"raised.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a uint32, this is represented in Python by a\n" +" UInt32 with variant_level==2.\n" +); + +dbus_uint32_t +dbus_py_uint32_range_check(PyObject *obj) +{ + unsigned long i; + PyObject *long_obj = PyNumber_Long(obj); + + if (!long_obj) return (dbus_uint32_t)(-1); + i = PyLong_AsUnsignedLong(long_obj); + if (i == (unsigned long)(-1) && PyErr_Occurred()) { + Py_CLEAR(long_obj); + return (dbus_uint32_t)(-1); + } + if (i > UINT32_MAX) { + PyErr_Format(PyExc_OverflowError, "Value %d out of range for UInt32", + (int)i); + Py_CLEAR(long_obj); + return (dbus_uint32_t)(-1); + } + Py_CLEAR(long_obj); + return i; +} + +static PyObject * +UInt32_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self = (DBusPyLongBase_Type.tp_new)(cls, args, kwargs); + if (self && dbus_py_uint32_range_check(self) == (dbus_uint32_t)(-1) + && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + return self; +} + +PyTypeObject DBusPyUInt32_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.UInt32", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + UInt32_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + UInt32_tp_new, /* tp_new */ +}; + +/* Int64 =========================================================== */ + +PyDoc_STRVAR(Int64_tp_doc, +"A signed 64-bit integer between -0x8000 0000 0000 0000 and\n" +"+0x7FFF FFFF FFFF FFFF, represented as a subtype of `long`.\n" +"\n" +"Note that this may be changed in future to be a subtype of `int` on\n" +"64-bit platforms; applications should not rely on either behaviour.\n" +"\n" +"This type only works on platforms where the C compiler has suitable\n" +"64-bit types, such as C99 ``long long``.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.Int64(value: long[, variant_level: int]) -> Int64\n" +"\n" +"``value`` must be within the allowed range, or `OverflowError` will be\n" +"raised.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an int64, this is represented in Python by an\n" +" Int64 with variant_level==2.\n" +); + +#ifdef DBUS_PYTHON_64_BIT_WORKS +dbus_int64_t +dbus_py_int64_range_check(PyObject *obj) +{ + PY_LONG_LONG i; + PyObject *long_obj = PyNumber_Long(obj); + + if (!long_obj) return -1; + i = PyLong_AsLongLong(long_obj); + if (i == -1 && PyErr_Occurred()) { + Py_CLEAR(long_obj); + return -1; + } + if (i < INT64_MIN || i > INT64_MAX) { + PyErr_SetString(PyExc_OverflowError, "Value out of range for Int64"); + Py_CLEAR(long_obj); + return -1; + } + Py_CLEAR(long_obj); + return i; +} +#endif + +static PyObject * +Int64_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ +#ifdef DBUS_PYTHON_64_BIT_WORKS + PyObject *self = (DBusPyLongBase_Type.tp_new)(cls, args, kwargs); + if (self && dbus_py_int64_range_check(self) == -1 && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + return self; +#else + PyErr_SetString(PyExc_NotImplementedError, + "64-bit types are not available on this platform"); + return NULL; +#endif +} + +PyTypeObject DBusPyInt64_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Int64", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Int64_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Int64_tp_new, /* tp_new */ +}; + +/* UInt64 =========================================================== */ + +PyDoc_STRVAR(UInt64_tp_doc, +"An unsigned 64-bit integer between 0 and 0xFFFF FFFF FFFF FFFF,\n" +"represented as a subtype of `long`.\n" +"\n" +"This type only exists on platforms where the C compiler has suitable\n" +"64-bit types, such as C99 ``unsigned long long``.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.UInt64(value: long[, variant_level: int]) -> UInt64\n" +"\n" +"``value`` must be within the allowed range, or `OverflowError` will be\n" +"raised.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a uint64, this is represented in Python by a\n" +" UInt64 with variant_level==2.\n" +); + +dbus_uint64_t +dbus_py_uint64_range_check(PyObject *obj) +{ + unsigned PY_LONG_LONG i; + PyObject *long_obj = PyNumber_Long(obj); + + if (!long_obj) return (dbus_uint64_t)(-1); + i = PyLong_AsUnsignedLongLong(long_obj); + if (i == (unsigned PY_LONG_LONG)(-1) && PyErr_Occurred()) { + Py_CLEAR(long_obj); + return (dbus_uint64_t)(-1); + } + if (i > UINT64_MAX) { + PyErr_SetString(PyExc_OverflowError, "Value out of range for UInt64"); + Py_CLEAR(long_obj); + return (dbus_uint64_t)(-1); + } + Py_CLEAR(long_obj); + return i; +} + +static PyObject * +UInt64_tp_new (PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ +#ifdef DBUS_PYTHON_64_BIT_WORKS + PyObject *self = (DBusPyLongBase_Type.tp_new)(cls, args, kwargs); + if (self && dbus_py_uint64_range_check(self) == (dbus_uint64_t)(-1) + && PyErr_Occurred()) { + Py_CLEAR(self); + return NULL; + } + return self; +#else + PyErr_SetString(PyExc_NotImplementedError, + "64-bit integer types are not supported on this platform"); + return NULL; +#endif +} + +PyTypeObject DBusPyUInt64_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.UInt64", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + UInt64_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + UInt64_tp_new, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_int_types(void) +{ + DBusPyInt16_Type.tp_base = &INTBASE; + if (PyType_Ready(&DBusPyInt16_Type) < 0) return 0; + /* disable the tp_print copied from PyInt_Type, so tp_repr gets called as + desired */ + DBusPyInt16_Type.tp_print = NULL; + + DBusPyUInt16_Type.tp_base = &INTBASE; + if (PyType_Ready(&DBusPyUInt16_Type) < 0) return 0; + DBusPyUInt16_Type.tp_print = NULL; + + DBusPyInt32_Type.tp_base = &INTBASE; + if (PyType_Ready(&DBusPyInt32_Type) < 0) return 0; + DBusPyInt32_Type.tp_print = NULL; + + DBusPyUInt32_Type.tp_base = &DBusPyLongBase_Type; + if (PyType_Ready(&DBusPyUInt32_Type) < 0) return 0; + DBusPyUInt32_Type.tp_print = NULL; + +#if defined(DBUS_HAVE_INT64) && defined(HAVE_LONG_LONG) + DBusPyInt64_Type.tp_base = &DBusPyLongBase_Type; + if (PyType_Ready(&DBusPyInt64_Type) < 0) return 0; + DBusPyInt64_Type.tp_print = NULL; + + DBusPyUInt64_Type.tp_base = &DBusPyLongBase_Type; + if (PyType_Ready(&DBusPyUInt64_Type) < 0) return 0; + DBusPyUInt64_Type.tp_print = NULL; +#endif + + DBusPyBoolean_Type.tp_base = &INTBASE; + if (PyType_Ready(&DBusPyBoolean_Type) < 0) return 0; + DBusPyBoolean_Type.tp_print = NULL; + + return 1; +} + +dbus_bool_t +dbus_py_insert_int_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF(&DBusPyInt16_Type); + Py_INCREF(&DBusPyUInt16_Type); + Py_INCREF(&DBusPyInt32_Type); + Py_INCREF(&DBusPyUInt32_Type); + Py_INCREF(&DBusPyInt64_Type); + Py_INCREF(&DBusPyUInt64_Type); + Py_INCREF(&DBusPyBoolean_Type); + if (PyModule_AddObject(this_module, "Int16", + (PyObject *)&DBusPyInt16_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "UInt16", + (PyObject *)&DBusPyUInt16_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "Int32", + (PyObject *)&DBusPyInt32_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "UInt32", + (PyObject *)&DBusPyUInt32_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "Int64", + (PyObject *)&DBusPyInt64_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "UInt64", + (PyObject *)&DBusPyUInt64_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "Boolean", + (PyObject *)&DBusPyBoolean_Type) < 0) return 0; + + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/libdbusconn.c b/_dbus_bindings/libdbusconn.c new file mode 100644 index 0000000..e9401fe --- /dev/null +++ b/_dbus_bindings/libdbusconn.c @@ -0,0 +1,126 @@ +/* An extremely thin wrapper around a libdbus Connection, for use by + * Server. + * + * Copyright (C) 2008 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" +#include "conn-internal.h" + +PyDoc_STRVAR(DBusPyLibDBusConnection_tp_doc, +"A reference to a ``DBusConnection`` from ``libdbus``, which might not\n" +"have been attached to a `dbus.connection.Connection` yet.\n" +"\n" +"Cannot be instantiated from Python. The only use of this object is to\n" +"pass it to the ``dbus.connection.Connection`` constructor instead of an\n" +"address.\n" +); + +/** Create a DBusPyLibDBusConnection from a DBusConnection. + */ +PyObject * +DBusPyLibDBusConnection_New(DBusConnection *conn) +{ + DBusPyLibDBusConnection *self = NULL; + + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(conn); + + self = (DBusPyLibDBusConnection *)(DBusPyLibDBusConnection_Type.tp_alloc( + &DBusPyLibDBusConnection_Type, 0)); + + if (!self) + return NULL; + + self->conn = dbus_connection_ref (conn); + + return (PyObject *)self; +} + +/* Destructor */ +static void +DBusPyLibDBusConnection_tp_dealloc(Connection *self) +{ + DBusConnection *conn = self->conn; + PyObject *et, *ev, *etb; + + /* avoid clobbering any pending exception */ + PyErr_Fetch(&et, &ev, &etb); + + self->conn = NULL; + + if (conn) { + dbus_connection_unref(conn); + } + + PyErr_Restore(et, ev, etb); + (Py_TYPE(self)->tp_free)((PyObject *) self); +} + +PyTypeObject DBusPyLibDBusConnection_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_dbus_bindings._LibDBusConnection", + sizeof(DBusPyLibDBusConnection), + 0, /*tp_itemsize*/ + /* methods */ + (destructor)DBusPyLibDBusConnection_tp_dealloc, + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, + DBusPyLibDBusConnection_tp_doc, +}; + +dbus_bool_t +dbus_py_init_libdbus_conn_types(void) +{ + if (PyType_Ready(&DBusPyLibDBusConnection_Type) < 0) + return FALSE; + + return TRUE; +} + +dbus_bool_t +dbus_py_insert_libdbus_conn_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF (&DBusPyLibDBusConnection_Type); + + if (PyModule_AddObject(this_module, "_LibDBusConnection", + (PyObject *)&DBusPyLibDBusConnection_Type) < 0) + return FALSE; + + return TRUE; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/mainloop.c b/_dbus_bindings/mainloop.c new file mode 100644 index 0000000..59d1e99 --- /dev/null +++ b/_dbus_bindings/mainloop.c @@ -0,0 +1,207 @@ +/* Implementation of main-loop integration for dbus-python. + * + * Copyright (C) 2006 Collabora Ltd. + * Copyright (C) 2008 Huang Peng + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +/* Native mainloop wrapper ========================================= */ + +PyDoc_STRVAR(NativeMainLoop_tp_doc, +"Object representing D-Bus main loop integration done in native code.\n" +"Cannot be instantiated directly.\n" +); + +static PyTypeObject NativeMainLoop_Type; + +DEFINE_CHECK(NativeMainLoop) + +typedef struct { + PyObject_HEAD + /* Called with the GIL held, should set a Python exception on error */ + dbus_bool_t (*set_up_connection_cb)(DBusConnection *, void *); + dbus_bool_t (*set_up_server_cb)(DBusServer *, void *); + /* Called in a destructor. Must not touch the exception state (use + * PyErr_Fetch and PyErr_Restore if necessary). */ + void (*free_cb)(void *); + void *data; +} NativeMainLoop; + +static void NativeMainLoop_tp_dealloc(NativeMainLoop *self) +{ + if (self->data && self->free_cb) { + (self->free_cb)(self->data); + } + PyObject_Del((PyObject *)self); +} + +static PyTypeObject NativeMainLoop_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.mainloop.NativeMainLoop", + sizeof(NativeMainLoop), + 0, + (destructor)NativeMainLoop_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + NativeMainLoop_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + /* deliberately not callable! */ + 0, /* tp_new */ +}; + +/* Internal C API for Connection, Bus, Server ======================= */ + +dbus_bool_t +dbus_py_check_mainloop_sanity(PyObject *mainloop) +{ + if (NativeMainLoop_Check(mainloop)) { + return TRUE; + } + PyErr_SetString(PyExc_TypeError, + "A dbus.mainloop.NativeMainLoop instance is required"); + return FALSE; +} + +dbus_bool_t +dbus_py_set_up_connection(PyObject *conn, PyObject *mainloop) +{ + if (NativeMainLoop_Check(mainloop)) { + /* Native mainloops are allowed to do arbitrary strange things */ + NativeMainLoop *nml = (NativeMainLoop *)mainloop; + DBusConnection *dbc = DBusPyConnection_BorrowDBusConnection(conn); + + if (!dbc) { + return FALSE; + } + return (nml->set_up_connection_cb)(dbc, nml->data); + } + PyErr_SetString(PyExc_TypeError, + "A dbus.mainloop.NativeMainLoop instance is required"); + return FALSE; +} + +dbus_bool_t +dbus_py_set_up_server(PyObject *server, PyObject *mainloop) +{ + if (NativeMainLoop_Check(mainloop)) { + /* Native mainloops are allowed to do arbitrary strange things */ + NativeMainLoop *nml = (NativeMainLoop *)mainloop; + DBusServer *dbs = DBusPyServer_BorrowDBusServer(server); + + if (!dbs) { + return FALSE; + } + return (nml->set_up_server_cb)(dbs, nml->data); + } + PyErr_SetString(PyExc_TypeError, + "A dbus.mainloop.NativeMainLoop instance is required"); + return FALSE; +} + +/* C API ============================================================ */ + +PyObject * +DBusPyNativeMainLoop_New4(dbus_bool_t (*conn_cb)(DBusConnection *, void *), + dbus_bool_t (*server_cb)(DBusServer *, void *), + void (*free_cb)(void *), + void *data) +{ + NativeMainLoop *self = PyObject_New(NativeMainLoop, &NativeMainLoop_Type); + if (self) { + self->data = data; + self->free_cb = free_cb; + self->set_up_connection_cb = conn_cb; + self->set_up_server_cb = server_cb; + } + return (PyObject *)self; +} + +/* Null mainloop implementation ===================================== */ + +static dbus_bool_t +noop_main_loop_cb(void *conn_or_server UNUSED, void *data UNUSED) +{ + return TRUE; +} + +#define noop_conn_cb ((dbus_bool_t (*)(DBusConnection *, void *))(noop_main_loop_cb)) +#define noop_server_cb ((dbus_bool_t (*)(DBusServer *, void *))(noop_main_loop_cb)) + +/* Initialization =================================================== */ + +dbus_bool_t +dbus_py_init_mainloop(void) +{ + if (PyType_Ready (&NativeMainLoop_Type) < 0) return 0; + + return 1; +} + +dbus_bool_t +dbus_py_insert_mainloop_types(PyObject *this_module) +{ + PyObject *null_main_loop = DBusPyNativeMainLoop_New4(noop_conn_cb, + noop_server_cb, + NULL, + NULL); + if (!null_main_loop) return 0; + + /* PyModule_AddObject steals a ref */ + Py_INCREF (&NativeMainLoop_Type); + if (PyModule_AddObject (this_module, "NativeMainLoop", + (PyObject *)&NativeMainLoop_Type) < 0) return 0; + if (PyModule_AddObject (this_module, "NULL_MAIN_LOOP", + null_main_loop) < 0) return 0; + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/message-append.c b/_dbus_bindings/message-append.c new file mode 100644 index 0000000..d20b493 --- /dev/null +++ b/_dbus_bindings/message-append.c @@ -0,0 +1,1293 @@ +/* D-Bus Message serialization. This contains all the logic to map from + * Python objects to D-Bus types. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include + +#define DBG_IS_TOO_VERBOSE +#include "compat-internal.h" +#include "types-internal.h" +#include "message-internal.h" + +/* Return the number of variants wrapping the given object. Return 0 + * if the object is not a D-Bus type. + */ +static long +get_variant_level(PyObject *obj) +{ + if (DBusPyString_Check(obj)) { + return ((DBusPyString *)obj)->variant_level; + } +#ifndef PY3 + else if (DBusPyIntBase_Check(obj)) { + return ((DBusPyIntBase *)obj)->variant_level; + } +#endif + else if (DBusPyFloatBase_Check(obj)) { + return ((DBusPyFloatBase *)obj)->variant_level; + } + else if (DBusPyArray_Check(obj)) { + return ((DBusPyArray *)obj)->variant_level; + } + else if (DBusPyDict_Check(obj)) { + return ((DBusPyDict *)obj)->variant_level; + } + else if (DBusPyLongBase_Check(obj) || +#ifdef PY3 + DBusPyBytesBase_Check(obj) || +#endif + DBusPyStrBase_Check(obj) || + DBusPyStruct_Check(obj)) { + return dbus_py_variant_level_get(obj); + } + else { + return 0; + } +} + +char dbus_py_Message_append__doc__[] = ( +"set_args(*args[, **kwargs])\n\n" +"Set the message's arguments from the positional parameter, according to\n" +"the signature given by the ``signature`` keyword parameter.\n" +"\n" +"The following type conversions are supported:\n\n" +"=============================== ===========================\n" +"D-Bus (in signature) Python\n" +"=============================== ===========================\n" +"boolean (b) any object (via bool())\n" +"byte (y) string of length 1\n" +" any integer\n" +"any integer type any integer\n" +"double (d) any float\n" +"object path anything with a __dbus_object_path__ attribute\n" +"string, signature, object path str (must be UTF-8) or unicode\n" +"dict (a{...}) any mapping\n" +"array (a...) any iterable over appropriate objects\n" +"struct ((...)) any iterable over appropriate objects\n" +"variant any object above (guess type as below)\n" +"=============================== ===========================\n" +"\n" +"Here 'any integer' means anything on which int() or long()\n" +"(as appropriate) will work, except for basestring subclasses.\n" +"'Any float' means anything on which float() will work, except\n" +"for basestring subclasses.\n" +"\n" +"If there is no signature, guess from the arguments using\n" +"the static method `Message.guess_signature`.\n" +); + +char dbus_py_Message_guess_signature__doc__[] = ( +"guess_signature(*args) -> Signature [static method]\n\n" +"Guess a D-Bus signature which should be used to encode the given\n" +"Python objects.\n" +"\n" +"The signature is constructed as follows:\n\n" +"+-------------------------------+---------------------------+\n" +"|Python |D-Bus |\n" +"+===============================+===========================+\n" +"|D-Bus type, variant_level > 0 |variant (v) |\n" +"+-------------------------------+---------------------------+\n" +"|D-Bus type, variant_level == 0 |the corresponding type |\n" +"+-------------------------------+---------------------------+\n" +"|anything with a |object path |\n" +"|__dbus_object_path__ attribute | |\n" +"+-------------------------------+---------------------------+\n" +"|bool |boolean (y) |\n" +"+-------------------------------+---------------------------+\n" +"|any other int subclass |int32 (i) |\n" +"+-------------------------------+---------------------------+\n" +"|any other long subclass |int64 (x) |\n" +"+-------------------------------+---------------------------+\n" +"|any other float subclass |double (d) |\n" +"+-------------------------------+---------------------------+\n" +"|any other str subclass |string (s) |\n" +"+-------------------------------+---------------------------+\n" +"|any other unicode subclass |string (s) |\n" +"+-------------------------------+---------------------------+\n" +"|any other tuple subclass |struct ((...)) |\n" +"+-------------------------------+---------------------------+\n" +"|any other list subclass |array (a...), guess |\n" +"| |contents' type according to|\n" +"| |type of first item |\n" +"+-------------------------------+---------------------------+\n" +"|any other dict subclass |dict (a{...}), guess key, |\n" +"| |value type according to |\n" +"| |types for an arbitrary item|\n" +"+-------------------------------+---------------------------+\n" +"|anything else |raise TypeError |\n" +"+-------------------------------+---------------------------+\n" +); + +/* return a new reference, possibly to None */ +static PyObject * +get_object_path(PyObject *obj) +{ + PyObject *magic_attr = PyObject_GetAttr(obj, dbus_py__dbus_object_path__const); + + if (magic_attr) { + if (PyUnicode_Check(magic_attr) || PyBytes_Check(magic_attr)) { + return magic_attr; + } + else { + Py_CLEAR(magic_attr); + PyErr_SetString(PyExc_TypeError, "__dbus_object_path__ must be " + "a string"); + return NULL; + } + } + else { + /* Ignore exceptions, except for SystemExit and KeyboardInterrupt */ + if (PyErr_ExceptionMatches(PyExc_SystemExit) || + PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) + return NULL; + PyErr_Clear(); + Py_RETURN_NONE; + } +} + +/* Return a new reference. If the object is a variant and variant_level_ptr + * is not NULL, put the variant level in the variable pointed to, and + * return the contained type instead of "v". */ +static PyObject * +_signature_string_from_pyobject(PyObject *obj, long *variant_level_ptr) +{ + PyObject *magic_attr; + long variant_level = get_variant_level(obj); + + if (variant_level < 0) + return NULL; + + if (variant_level_ptr) { + *variant_level_ptr = variant_level; + } + else if (variant_level > 0) { + return NATIVESTR_FROMSTR(DBUS_TYPE_VARIANT_AS_STRING); + } + + if (obj == Py_True || obj == Py_False) { + return NATIVESTR_FROMSTR(DBUS_TYPE_BOOLEAN_AS_STRING); + } + + magic_attr = get_object_path(obj); + if (!magic_attr) + return NULL; + if (magic_attr != Py_None) { + Py_CLEAR(magic_attr); + return NATIVESTR_FROMSTR(DBUS_TYPE_OBJECT_PATH_AS_STRING); + } + Py_CLEAR(magic_attr); + + /* Ordering is important: some of these are subclasses of each other. */ +#ifdef PY3 + if (PyLong_Check(obj)) { + if (DBusPyUInt64_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UINT64_AS_STRING); + else if (DBusPyInt64_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_INT64_AS_STRING); + else if (DBusPyUInt32_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UINT32_AS_STRING); + else if (DBusPyInt32_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_INT32_AS_STRING); + else if (DBusPyUInt16_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UINT16_AS_STRING); + else if (DBusPyInt16_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_INT16_AS_STRING); + else if (DBusPyByte_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_BYTE_AS_STRING); + else if (DBusPyBoolean_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_BOOLEAN_AS_STRING); + else + return NATIVESTR_FROMSTR(DBUS_TYPE_INT32_AS_STRING); + } +#else /* !PY3 */ + if (PyInt_Check(obj)) { + if (DBusPyInt16_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_INT16_AS_STRING); + else if (DBusPyInt32_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_INT32_AS_STRING); + else if (DBusPyByte_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_BYTE_AS_STRING); + else if (DBusPyUInt16_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UINT16_AS_STRING); + else if (DBusPyBoolean_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_BOOLEAN_AS_STRING); + else + return NATIVESTR_FROMSTR(DBUS_TYPE_INT32_AS_STRING); + } + else if (PyLong_Check(obj)) { + if (DBusPyInt64_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_INT64_AS_STRING); + else if (DBusPyUInt32_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UINT32_AS_STRING); + else if (DBusPyUInt64_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UINT64_AS_STRING); + else + return NATIVESTR_FROMSTR(DBUS_TYPE_INT64_AS_STRING); + } +#endif /* PY3 */ + else if (PyUnicode_Check(obj)) { + /* Object paths and signatures are unicode subtypes in Python 3 + * (the first two cases will never be true in Python 2) */ + if (DBusPyObjectPath_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_OBJECT_PATH_AS_STRING); + else if (DBusPySignature_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_SIGNATURE_AS_STRING); + else + return NATIVESTR_FROMSTR(DBUS_TYPE_STRING_AS_STRING); + } +#if defined(DBUS_TYPE_UNIX_FD) + else if (DBusPyUnixFd_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_UNIX_FD_AS_STRING); +#endif + else if (PyFloat_Check(obj)) { +#ifdef WITH_DBUS_FLOAT32 + if (DBusPyDouble_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_DOUBLE_AS_STRING); + else if (DBusPyFloat_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_FLOAT_AS_STRING); + else +#endif + return NATIVESTR_FROMSTR(DBUS_TYPE_DOUBLE_AS_STRING); + } + else if (PyBytes_Check(obj)) { + /* Object paths and signatures are bytes subtypes in Python 2 + * (the first two cases will never be true in Python 3) */ + if (DBusPyObjectPath_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_OBJECT_PATH_AS_STRING); + else if (DBusPySignature_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_SIGNATURE_AS_STRING); + else if (DBusPyByteArray_Check(obj)) + return NATIVESTR_FROMSTR(DBUS_TYPE_ARRAY_AS_STRING + DBUS_TYPE_BYTE_AS_STRING); + else + return NATIVESTR_FROMSTR(DBUS_TYPE_STRING_AS_STRING); + } + else if (PyTuple_Check(obj)) { + Py_ssize_t len = PyTuple_GET_SIZE(obj); + PyObject *list = PyList_New(len + 2); /* new ref */ + PyObject *item; /* temporary new ref */ + PyObject *empty_str; /* temporary new ref */ + PyObject *ret; + Py_ssize_t i; + + if (!list) return NULL; + if (len == 0) { + PyErr_SetString(PyExc_ValueError, "D-Bus structs cannot be empty"); + Py_CLEAR(list); + return NULL; + } + /* Set the first and last elements of list to be the parentheses */ + item = NATIVESTR_FROMSTR(DBUS_STRUCT_BEGIN_CHAR_AS_STRING); + if (PyList_SetItem(list, 0, item) < 0) { + Py_CLEAR(list); + return NULL; + } + item = NATIVESTR_FROMSTR(DBUS_STRUCT_END_CHAR_AS_STRING); + if (PyList_SetItem(list, len + 1, item) < 0) { + Py_CLEAR(list); + return NULL; + } + if (!item || !PyList_GET_ITEM(list, 0)) { + Py_CLEAR(list); + return NULL; + } + item = NULL; + + for (i = 0; i < len; i++) { + item = PyTuple_GetItem(obj, i); + if (!item) { + Py_CLEAR(list); + return NULL; + } + item = _signature_string_from_pyobject(item, NULL); + if (!item) { + Py_CLEAR(list); + return NULL; + } + if (PyList_SetItem(list, i + 1, item) < 0) { + Py_CLEAR(list); + return NULL; + } + item = NULL; + } + empty_str = NATIVESTR_FROMSTR(""); + if (!empty_str) { + /* really shouldn't happen */ + Py_CLEAR(list); + return NULL; + } + ret = PyObject_CallMethod(empty_str, "join", "(O)", list); /* new ref */ + /* whether ret is NULL or not, */ + Py_CLEAR(empty_str); + Py_CLEAR(list); + return ret; + } + else if (PyList_Check(obj)) { + PyObject *tmp; + PyObject *ret = NATIVESTR_FROMSTR(DBUS_TYPE_ARRAY_AS_STRING); + if (!ret) return NULL; +#ifdef PY3 + if (DBusPyArray_Check(obj) && + PyUnicode_Check(((DBusPyArray *)obj)->signature)) + { + PyObject *concat = PyUnicode_Concat( + ret, ((DBusPyArray *)obj)->signature); + Py_CLEAR(ret); + return concat; + } +#else + if (DBusPyArray_Check(obj) && + PyBytes_Check(((DBusPyArray *)obj)->signature)) + { + PyBytes_Concat(&ret, ((DBusPyArray *)obj)->signature); + return ret; + } +#endif + if (PyList_GET_SIZE(obj) == 0) { + /* No items, so fail. Or should we guess "av"? */ + PyErr_SetString(PyExc_ValueError, "Unable to guess signature " + "from an empty list"); + return NULL; + } + tmp = PyList_GetItem(obj, 0); + tmp = _signature_string_from_pyobject(tmp, NULL); + if (!tmp) return NULL; +#ifdef PY3 + { + PyObject *concat = PyUnicode_Concat(ret, tmp); + Py_CLEAR(ret); + Py_CLEAR(tmp); + return concat; + } +#else + PyBytes_ConcatAndDel(&ret, tmp); + return ret; +#endif + } + else if (PyDict_Check(obj)) { + PyObject *key, *value, *keysig, *valuesig; + Py_ssize_t pos = 0; + PyObject *ret = NULL; + +#ifdef PY3 + if (DBusPyDict_Check(obj) && + PyUnicode_Check(((DBusPyDict *)obj)->signature)) + { + return PyUnicode_FromFormat((DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + "%U" + DBUS_DICT_ENTRY_END_CHAR_AS_STRING), + ((DBusPyDict *)obj)->signature); + } +#else + if (DBusPyDict_Check(obj) && + PyBytes_Check(((DBusPyDict *)obj)->signature)) + { + const char *sig = PyBytes_AS_STRING(((DBusPyDict *)obj)->signature); + + return PyBytes_FromFormat((DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + "%s" + DBUS_DICT_ENTRY_END_CHAR_AS_STRING), + sig); + } +#endif + if (!PyDict_Next(obj, &pos, &key, &value)) { + /* No items, so fail. Or should we guess "a{vv}"? */ + PyErr_SetString(PyExc_ValueError, "Unable to guess signature " + "from an empty dict"); + return NULL; + } + keysig = _signature_string_from_pyobject(key, NULL); + valuesig = _signature_string_from_pyobject(value, NULL); + if (keysig && valuesig) { +#ifdef PY3 + ret = PyUnicode_FromFormat((DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + "%U%U" + DBUS_DICT_ENTRY_END_CHAR_AS_STRING), + keysig, valuesig); +#else + ret = PyBytes_FromFormat((DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + "%s%s" + DBUS_DICT_ENTRY_END_CHAR_AS_STRING), + PyBytes_AS_STRING(keysig), + PyBytes_AS_STRING(valuesig)); +#endif + } + Py_CLEAR(keysig); + Py_CLEAR(valuesig); + return ret; + } + else { + PyErr_Format(PyExc_TypeError, "Don't know which D-Bus type " + "to use to encode type \"%s\"", + Py_TYPE(obj)->tp_name); + return NULL; + } +} + +PyObject * +dbus_py_Message_guess_signature(PyObject *unused UNUSED, PyObject *args) +{ + PyObject *tmp, *ret = NULL; + + if (!args) { + if (!PyErr_Occurred()) { + PyErr_BadInternalCall(); + } + return NULL; + } + +#ifdef USING_DBG + fprintf(stderr, "DBG/%ld: called Message_guess_signature", (long)getpid()); + PyObject_Print(args, stderr, 0); + fprintf(stderr, "\n"); +#endif + + if (!PyTuple_Check(args)) { + DBG("%s", "Message_guess_signature: args not a tuple"); + PyErr_BadInternalCall(); + return NULL; + } + + /* if there were no args, easy */ + if (PyTuple_GET_SIZE(args) == 0) { + DBG("%s", "Message_guess_signature: no args, so return Signature('')"); + return PyObject_CallFunction((PyObject *)&DBusPySignature_Type, "(s)", ""); + } + + /* if there were args, the signature we want is, by construction, + * exactly the signature we get for the tuple args, except that we don't + * want the parentheses. */ + tmp = _signature_string_from_pyobject(args, NULL); + if (!tmp) { + DBG("%s", "Message_guess_signature: failed"); + return NULL; + } + if (PyUnicode_Check(tmp)) { + PyObject *as_bytes = PyUnicode_AsUTF8String(tmp); + Py_CLEAR(tmp); + if (!as_bytes) + return NULL; + if (PyBytes_GET_SIZE(as_bytes) < 2) { + PyErr_SetString(PyExc_RuntimeError, "Internal error: " + "_signature_string_from_pyobject returned " + "a bad result"); + Py_CLEAR(as_bytes); + return NULL; + } + tmp = as_bytes; + } + if (!PyBytes_Check(tmp) || PyBytes_GET_SIZE(tmp) < 2) { + PyErr_SetString(PyExc_RuntimeError, "Internal error: " + "_signature_string_from_pyobject returned " + "a bad result"); + Py_CLEAR(tmp); + return NULL; + } + ret = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, "(s#)", + PyBytes_AS_STRING(tmp) + 1, + PyBytes_GET_SIZE(tmp) - 2); + Py_CLEAR(tmp); + return ret; +} + +static int _message_iter_append_pyobject(DBusMessageIter *appender, + DBusSignatureIter *sig_iter, + PyObject *obj, + dbus_bool_t *more); +static int _message_iter_append_variant(DBusMessageIter *appender, + PyObject *obj); + +static int +_message_iter_append_string(DBusMessageIter *appender, + int sig_type, PyObject *obj, + dbus_bool_t allow_object_path_attr) +{ + char *s; + PyObject *utf8; + + if (sig_type == DBUS_TYPE_OBJECT_PATH && allow_object_path_attr) { + PyObject *object_path = get_object_path (obj); + + if (object_path == Py_None) { + Py_CLEAR(object_path); + } + else if (!object_path) { + return -1; + } + else { + int ret = _message_iter_append_string(appender, sig_type, + object_path, FALSE); + Py_CLEAR(object_path); + return ret; + } + } + + if (PyBytes_Check(obj)) { + utf8 = obj; + Py_INCREF(obj); + } + else if (PyUnicode_Check(obj)) { + utf8 = PyUnicode_AsUTF8String(obj); + if (!utf8) return -1; + } + else { + PyErr_SetString(PyExc_TypeError, + "Expected a string or unicode object"); + return -1; + } + + /* Raise TypeError if the string has embedded NULs */ + if (PyBytes_AsStringAndSize(utf8, &s, NULL) < 0) + return -1; + + /* Validate UTF-8, strictly */ + if (!dbus_validate_utf8(s, NULL)) { + PyErr_SetString(PyExc_UnicodeError, "String parameters " + "to be sent over D-Bus must be valid UTF-8 " + "with no noncharacter code points"); + return -1; + } + + DBG("Performing actual append: string (from unicode) %s", s); + if (!dbus_message_iter_append_basic(appender, sig_type, &s)) { + Py_CLEAR(utf8); + PyErr_NoMemory(); + return -1; + } + + Py_CLEAR(utf8); + return 0; +} + +static int +_message_iter_append_byte(DBusMessageIter *appender, PyObject *obj) +{ + unsigned char y; + + if (PyBytes_Check(obj)) { + if (PyBytes_GET_SIZE(obj) != 1) { + PyErr_Format(PyExc_ValueError, + "Expected a length-1 bytes but found %d bytes", + (int)PyBytes_GET_SIZE(obj)); + return -1; + } + y = *(unsigned char *)PyBytes_AS_STRING(obj); + } + else { + /* on Python 2 this accepts either int or long */ + long i = PyLong_AsLong(obj); + + if (i == -1 && PyErr_Occurred()) return -1; + if (i < 0 || i > 0xff) { + PyErr_Format(PyExc_ValueError, + "%d outside range for a byte value", + (int)i); + return -1; + } + y = i; + } + DBG("Performing actual append: byte \\x%02x", (unsigned)y); + if (!dbus_message_iter_append_basic(appender, DBUS_TYPE_BYTE, &y)) { + PyErr_NoMemory(); + return -1; + } + return 0; +} + +static dbus_bool_t +dbuspy_message_iter_close_container(DBusMessageIter *iter, + DBusMessageIter *sub, + dbus_bool_t is_ok) +{ + if (!is_ok) { + dbus_message_iter_abandon_container(iter, sub); + return TRUE; + } + return dbus_message_iter_close_container(iter, sub); +} + +#if defined(DBUS_TYPE_UNIX_FD) +static int +_message_iter_append_unixfd(DBusMessageIter *appender, PyObject *obj) +{ + int fd; + long original_fd; + + if (INTORLONG_CHECK(obj)) + { + /* on Python 2 this accepts either int or long */ + original_fd = PyLong_AsLong(obj); + if (original_fd == -1 && PyErr_Occurred()) + return -1; + if (original_fd < INT_MIN || original_fd > INT_MAX) { + PyErr_Format(PyExc_ValueError, "out of int range: %ld", + original_fd); + return -1; + } + fd = (int)original_fd; + } + else if (PyObject_IsInstance(obj, (PyObject*) &DBusPyUnixFd_Type)) { + fd = dbus_py_unix_fd_get_fd(obj); + } + else { + return -1; + } + + DBG("Performing actual append: fd %d", fd); + if (!dbus_message_iter_append_basic(appender, DBUS_TYPE_UNIX_FD, &fd)) { + PyErr_NoMemory(); + return -1; + } + return 0; +} +#endif + +static int +_message_iter_append_dictentry(DBusMessageIter *appender, + DBusSignatureIter *sig_iter, + PyObject *dict, PyObject *key) +{ + DBusSignatureIter sub_sig_iter; + DBusMessageIter sub; + int ret = -1; + PyObject *value = PyObject_GetItem(dict, key); + dbus_bool_t more; + + if (!value) return -1; + +#ifdef USING_DBG + fprintf(stderr, "Append dictentry: "); + PyObject_Print(key, stderr, 0); + fprintf(stderr, " => "); + PyObject_Print(value, stderr, 0); + fprintf(stderr, "\n"); +#endif + + DBG("Recursing signature iterator %p -> %p", sig_iter, &sub_sig_iter); + dbus_signature_iter_recurse(sig_iter, &sub_sig_iter); +#ifdef USING_DBG + { + char *s; + s = dbus_signature_iter_get_signature(sig_iter); + DBG("Signature of parent iterator %p is %s", sig_iter, s); + dbus_free(s); + s = dbus_signature_iter_get_signature(&sub_sig_iter); + DBG("Signature of sub-iterator %p is %s", &sub_sig_iter, s); + dbus_free(s); + } +#endif + + DBG("%s", "Opening DICT_ENTRY container"); + if (!dbus_message_iter_open_container(appender, DBUS_TYPE_DICT_ENTRY, + NULL, &sub)) { + PyErr_NoMemory(); + goto out; + } + ret = _message_iter_append_pyobject(&sub, &sub_sig_iter, key, &more); + if (ret == 0) { + ret = _message_iter_append_pyobject(&sub, &sub_sig_iter, value, &more); + } + DBG("%s", "Closing DICT_ENTRY container"); + if (!dbuspy_message_iter_close_container(appender, &sub, (ret == 0))) { + PyErr_NoMemory(); + ret = -1; + } +out: + Py_CLEAR(value); + return ret; +} + +static int +_message_iter_append_multi(DBusMessageIter *appender, + const DBusSignatureIter *sig_iter, + int mode, PyObject *obj) +{ + DBusMessageIter sub_appender; + DBusSignatureIter sub_sig_iter; + PyObject *contents; + int ret; + PyObject *iterator = PyObject_GetIter(obj); + char *sig = NULL; + int container = mode; + dbus_bool_t is_byte_array = DBusPyByteArray_Check(obj); + int inner_type; + dbus_bool_t more; + + assert(mode == DBUS_TYPE_DICT_ENTRY || mode == DBUS_TYPE_ARRAY || + mode == DBUS_TYPE_STRUCT); + +#ifdef USING_DBG + fprintf(stderr, "Appending multiple: "); + PyObject_Print(obj, stderr, 0); + fprintf(stderr, "\n"); +#endif + + if (!iterator) return -1; + if (mode == DBUS_TYPE_DICT_ENTRY) container = DBUS_TYPE_ARRAY; + + DBG("Recursing signature iterator %p -> %p", sig_iter, &sub_sig_iter); + dbus_signature_iter_recurse(sig_iter, &sub_sig_iter); +#ifdef USING_DBG + { + char *s; + s = dbus_signature_iter_get_signature(sig_iter); + DBG("Signature of parent iterator %p is %s", sig_iter, s); + dbus_free(s); + s = dbus_signature_iter_get_signature(&sub_sig_iter); + DBG("Signature of sub-iterator %p is %s", &sub_sig_iter, s); + dbus_free(s); + } +#endif + inner_type = dbus_signature_iter_get_current_type(&sub_sig_iter); + + if (mode == DBUS_TYPE_ARRAY || mode == DBUS_TYPE_DICT_ENTRY) { + sig = dbus_signature_iter_get_signature(&sub_sig_iter); + if (!sig) { + PyErr_NoMemory(); + ret = -1; + goto out; + } + } + /* else leave sig set to NULL. */ + + DBG("Opening '%c' container", container); + if (!dbus_message_iter_open_container(appender, container, + sig, &sub_appender)) { + PyErr_NoMemory(); + ret = -1; + goto out; + } + ret = 0; + more = TRUE; + while ((contents = PyIter_Next(iterator))) { + + if (mode == DBUS_TYPE_ARRAY || mode == DBUS_TYPE_DICT_ENTRY) { + DBG("Recursing signature iterator %p -> %p", sig_iter, &sub_sig_iter); + dbus_signature_iter_recurse(sig_iter, &sub_sig_iter); +#ifdef USING_DBG + { + char *s; + s = dbus_signature_iter_get_signature(sig_iter); + DBG("Signature of parent iterator %p is %s", sig_iter, s); + dbus_free(s); + s = dbus_signature_iter_get_signature(&sub_sig_iter); + DBG("Signature of sub-iterator %p is %s", &sub_sig_iter, s); + dbus_free(s); + } +#endif + } + else /* struct */ { + if (!more) { + PyErr_Format(PyExc_TypeError, "Fewer items found in struct's " + "D-Bus signature than in Python arguments "); + ret = -1; + break; + } + } + + if (mode == DBUS_TYPE_DICT_ENTRY) { + ret = _message_iter_append_dictentry(&sub_appender, &sub_sig_iter, + obj, contents); + } + else if (mode == DBUS_TYPE_ARRAY && is_byte_array + && inner_type == DBUS_TYPE_VARIANT) { + /* Subscripting a ByteArray gives a str of length 1, but if the + * container is a ByteArray and the parameter is an array of + * variants, we want to produce an array of variants containing + * bytes, not strings. + */ + PyObject *args = Py_BuildValue("(O)", contents); + PyObject *byte; + + if (!args) + break; + byte = PyObject_Call((PyObject *)&DBusPyByte_Type, args, NULL); + Py_CLEAR(args); + if (!byte) + break; + ret = _message_iter_append_variant(&sub_appender, byte); + Py_CLEAR(byte); + } + else { + /* advances sub_sig_iter and sets more on success - for array + * this doesn't matter, for struct it's essential */ + ret = _message_iter_append_pyobject(&sub_appender, &sub_sig_iter, + contents, &more); + } + + Py_CLEAR(contents); + if (ret < 0) { + break; + } + } + + if (PyErr_Occurred()) { + ret = -1; + } + else if (mode == DBUS_TYPE_STRUCT && more) { + PyErr_Format(PyExc_TypeError, "More items found in struct's D-Bus " + "signature than in Python arguments "); + ret = -1; + } + + /* This must be run as cleanup, even on failure. */ + DBG("Closing '%c' container", container); + if (!dbuspy_message_iter_close_container(appender, &sub_appender, (ret == 0))) { + PyErr_NoMemory(); + ret = -1; + } + +out: + Py_CLEAR(iterator); + dbus_free(sig); + return ret; +} + +static int +_message_iter_append_string_as_byte_array(DBusMessageIter *appender, + PyObject *obj) +{ + /* a bit of a faster path for byte arrays that are strings */ + Py_ssize_t len = PyBytes_GET_SIZE(obj); + const char *s; + DBusMessageIter sub; + int ret; + + s = PyBytes_AS_STRING(obj); + DBG("%s", "Opening ARRAY container"); + if (!dbus_message_iter_open_container(appender, DBUS_TYPE_ARRAY, + DBUS_TYPE_BYTE_AS_STRING, &sub)) { + PyErr_NoMemory(); + return -1; + } + DBG("Appending fixed array of %d bytes", (int)len); + if (dbus_message_iter_append_fixed_array(&sub, DBUS_TYPE_BYTE, &s, len)) { + ret = 0; + } + else { + PyErr_NoMemory(); + ret = -1; + } + DBG("%s", "Closing ARRAY container"); + if (!dbus_message_iter_close_container(appender, &sub)) { + PyErr_NoMemory(); + return -1; + } + return ret; +} + +/* Encode some Python object into a D-Bus variant slot. */ +static int +_message_iter_append_variant(DBusMessageIter *appender, PyObject *obj) +{ + DBusSignatureIter obj_sig_iter; + const char *obj_sig_str; + PyObject *obj_sig; + int ret; + long variant_level; + dbus_bool_t dummy; + DBusMessageIter *variant_iters = NULL; + + /* Separate the object into the contained object, and the number of + * variants it's wrapped in. */ + obj_sig = _signature_string_from_pyobject(obj, &variant_level); + if (!obj_sig) return -1; + + if (PyUnicode_Check(obj_sig)) { + PyObject *obj_sig_as_bytes = PyUnicode_AsUTF8String(obj_sig); + Py_CLEAR(obj_sig); + if (!obj_sig_as_bytes) + return -1; + obj_sig = obj_sig_as_bytes; + } + obj_sig_str = PyBytes_AsString(obj_sig); + if (!obj_sig_str) { + Py_CLEAR(obj_sig); + return -1; + } + + if (variant_level < 1) { + variant_level = 1; + } + + dbus_signature_iter_init(&obj_sig_iter, obj_sig_str); + + { + long i; + + variant_iters = calloc (variant_level, sizeof (DBusMessageIter)); + + if (!variant_iters) { + PyErr_NoMemory(); + ret = -1; + goto out; + } + + for (i = 0; i < variant_level; i++) { + DBusMessageIter *child = &variant_iters[i]; + /* The first is a special case: its parent is the iter passed in + * to this function, instead of being the previous one in the + * stack + */ + DBusMessageIter *parent = (i == 0 + ? appender + : &(variant_iters[i-1])); + /* The last is also a special case: it contains the actual + * object, rather than another variant + */ + const char *sig_str = (i == variant_level-1 + ? obj_sig_str + : DBUS_TYPE_VARIANT_AS_STRING); + + DBG("Opening VARIANT container %p inside %p containing '%s'", + child, parent, sig_str); + if (!dbus_message_iter_open_container(parent, DBUS_TYPE_VARIANT, + sig_str, child)) { + PyErr_NoMemory(); + ret = -1; + goto out; + } + } + + /* Put the object itself into the innermost variant */ + ret = _message_iter_append_pyobject(&variant_iters[variant_level-1], + &obj_sig_iter, obj, &dummy); + + /* here we rely on i (and variant_level) being a signed long */ + for (i = variant_level - 1; i >= 0; i--) { + DBusMessageIter *child = &variant_iters[i]; + /* The first is a special case: its parent is the iter passed in + * to this function, instead of being the previous one in the + * stack + */ + DBusMessageIter *parent = (i == 0 ? appender + : &(variant_iters[i-1])); + + DBG("Closing VARIANT container %p inside %p", child, parent); + if (!dbus_message_iter_close_container(parent, child)) { + PyErr_NoMemory(); + ret = -1; + goto out; + } + } + } + +out: + if (variant_iters != NULL) + free (variant_iters); + + Py_CLEAR(obj_sig); + return ret; +} + +/* On success, *more is set to whether there's more in the signature. */ +static int +_message_iter_append_pyobject(DBusMessageIter *appender, + DBusSignatureIter *sig_iter, + PyObject *obj, + dbus_bool_t *more) +{ + int sig_type = dbus_signature_iter_get_current_type(sig_iter); + DBusBasicValue u; + int ret = -1; + +#ifdef USING_DBG + fprintf(stderr, "Appending object at %p: ", obj); + PyObject_Print(obj, stderr, 0); + fprintf(stderr, " into appender at %p, dbus wants type %c\n", + appender, sig_type); +#endif + + switch (sig_type) { + /* The numeric types are relatively simple to deal with, so are + * inlined here. */ + + case DBUS_TYPE_BOOLEAN: + if (PyObject_IsTrue(obj)) { + u.bool_val = 1; + } + else { + u.bool_val = 0; + } + DBG("Performing actual append: bool(%ld)", (long)u.bool_val); + if (!dbus_message_iter_append_basic(appender, sig_type, &u.bool_val)) { + PyErr_NoMemory(); + ret = -1; + break; + } + ret = 0; + break; + + case DBUS_TYPE_DOUBLE: + u.dbl = PyFloat_AsDouble(obj); + if (PyErr_Occurred()) { + ret = -1; + break; + } + DBG("Performing actual append: double(%f)", u.dbl); + if (!dbus_message_iter_append_basic(appender, sig_type, &u.dbl)) { + PyErr_NoMemory(); + ret = -1; + break; + } + ret = 0; + break; + +#ifdef WITH_DBUS_FLOAT32 + case DBUS_TYPE_FLOAT: + u.dbl = PyFloat_AsDouble(obj); + if (PyErr_Occurred()) { + ret = -1; + break; + } + /* FIXME: DBusBasicValue will need to grow a float member if + * float32 becomes supported */ + u.f = (float)u.dbl; + DBG("Performing actual append: float(%f)", u.f); + if (!dbus_message_iter_append_basic(appender, sig_type, &u.f)) { + PyErr_NoMemory(); + ret = -1; + break; + } + ret = 0; + break; +#endif + + /* The integer types are all basically the same - we delegate to + intNN_range_check() */ +#define PROCESS_INTEGER(size, member) \ + u.member = dbus_py_##size##_range_check(obj);\ + if (u.member == (dbus_##size##_t)(-1) && PyErr_Occurred()) {\ + ret = -1; \ + break; \ + }\ + DBG("Performing actual append: " #size "(%lld)", (long long)u.member); \ + if (!dbus_message_iter_append_basic(appender, sig_type, &u.member)) {\ + PyErr_NoMemory();\ + ret = -1;\ + break;\ + } \ + ret = 0; + + case DBUS_TYPE_INT16: + PROCESS_INTEGER(int16, i16) + break; + case DBUS_TYPE_UINT16: + PROCESS_INTEGER(uint16, u16) + break; + case DBUS_TYPE_INT32: + PROCESS_INTEGER(int32, i32) + break; + case DBUS_TYPE_UINT32: + PROCESS_INTEGER(uint32, u32) + break; +#if defined(DBUS_HAVE_INT64) && defined(HAVE_LONG_LONG) + case DBUS_TYPE_INT64: + PROCESS_INTEGER(int64, i64) + break; + case DBUS_TYPE_UINT64: + PROCESS_INTEGER(uint64, u64) + break; +#else + case DBUS_TYPE_INT64: + case DBUS_TYPE_UINT64: + PyErr_SetString(PyExc_NotImplementedError, "64-bit integer " + "types are not supported on this platform"); + ret = -1; + break; +#endif +#undef PROCESS_INTEGER + + /* Now the more complicated cases, which are delegated to helper + * functions (although in practice, the compiler will hopefully + * inline them anyway). */ + + case DBUS_TYPE_STRING: + case DBUS_TYPE_SIGNATURE: + case DBUS_TYPE_OBJECT_PATH: + ret = _message_iter_append_string(appender, sig_type, obj, TRUE); + break; + + case DBUS_TYPE_BYTE: + ret = _message_iter_append_byte(appender, obj); + break; + + case DBUS_TYPE_ARRAY: + /* 3 cases - it might actually be a dict, or it might be a byte array + * being copied from a string (for which we have a faster path), + * or it might be a generic array. */ + + sig_type = dbus_signature_iter_get_element_type(sig_iter); + if (sig_type == DBUS_TYPE_DICT_ENTRY) + ret = _message_iter_append_multi(appender, sig_iter, + DBUS_TYPE_DICT_ENTRY, obj); + else if (sig_type == DBUS_TYPE_BYTE && PyBytes_Check(obj)) + ret = _message_iter_append_string_as_byte_array(appender, obj); + else + ret = _message_iter_append_multi(appender, sig_iter, + DBUS_TYPE_ARRAY, obj); + DBG("_message_iter_append_multi(): %d", ret); + break; + + case DBUS_TYPE_STRUCT: + ret = _message_iter_append_multi(appender, sig_iter, sig_type, obj); + break; + + case DBUS_TYPE_VARIANT: + ret = _message_iter_append_variant(appender, obj); + break; + + case DBUS_TYPE_INVALID: + PyErr_SetString(PyExc_TypeError, "Fewer items found in D-Bus " + "signature than in Python arguments"); + ret = -1; + break; + +#if defined(DBUS_TYPE_UNIX_FD) + case DBUS_TYPE_UNIX_FD: + ret = _message_iter_append_unixfd(appender, obj); + break; +#endif + + default: + PyErr_Format(PyExc_TypeError, "Unknown type '\\x%x' in D-Bus " + "signature", sig_type); + ret = -1; + break; + } + if (ret < 0) return -1; + + DBG("Advancing signature iter at %p", sig_iter); + *more = dbus_signature_iter_next(sig_iter); +#ifdef USING_DBG + DBG("- result: %ld, type %02x '%c'", (long)(*more), + (int)dbus_signature_iter_get_current_type(sig_iter), + (int)dbus_signature_iter_get_current_type(sig_iter)); +#endif + return 0; +} + + +PyObject * +dbus_py_Message_append(Message *self, PyObject *args, PyObject *kwargs) +{ + const char *signature = NULL; + PyObject *signature_obj = NULL; + DBusSignatureIter sig_iter; + DBusMessageIter appender; + static char *argnames[] = {"signature", NULL}; + dbus_bool_t more; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + +#ifdef USING_DBG + fprintf(stderr, "DBG/%ld: called Message_append(*", (long)getpid()); + PyObject_Print(args, stderr, 0); + if (kwargs) { + fprintf(stderr, ", **"); + PyObject_Print(kwargs, stderr, 0); + } + fprintf(stderr, ")\n"); +#endif + + /* only use kwargs for this step: deliberately ignore args for now */ + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, "|z:append", + argnames, &signature)) return NULL; + + if (!signature) { + DBG("%s", "No signature for message, guessing..."); + signature_obj = dbus_py_Message_guess_signature(NULL, args); + if (!signature_obj) return NULL; + if (PyUnicode_Check(signature_obj)) { + PyObject *signature_as_bytes; + signature_as_bytes = PyUnicode_AsUTF8String(signature_obj); + Py_CLEAR(signature_obj); + if (!signature_as_bytes) + return NULL; + signature_obj = signature_as_bytes; + } + else { + assert(PyBytes_Check(signature_obj)); + } + signature = PyBytes_AS_STRING(signature_obj); + } + /* from here onwards, you have to do a goto rather than returning NULL + to make sure signature_obj gets freed */ + + /* iterate over args and the signature, together */ + if (!dbus_signature_validate(signature, NULL)) { + PyErr_SetString(PyExc_ValueError, "Corrupt type signature"); + goto err; + } + dbus_message_iter_init_append(self->msg, &appender); + + if (signature[0] != '\0') { + int i = 0; + + more = TRUE; + dbus_signature_iter_init(&sig_iter, signature); + while (more) { + if (i >= PyTuple_GET_SIZE(args)) { + PyErr_SetString(PyExc_TypeError, "More items found in D-Bus " + "signature than in Python arguments"); + goto hosed; + } + if (_message_iter_append_pyobject(&appender, &sig_iter, + PyTuple_GET_ITEM(args, i), + &more) < 0) { + goto hosed; + } + i++; + } + if (i < PyTuple_GET_SIZE(args)) { + PyErr_SetString(PyExc_TypeError, "Fewer items found in D-Bus " + "signature than in Python arguments"); + goto hosed; + } + } + + /* success! */ + Py_CLEAR(signature_obj); + Py_RETURN_NONE; + +hosed: + /* "If appending any of the arguments fails due to lack of memory, + * generally the message is hosed and you have to start over" -libdbus docs + * Enforce this by throwing away the message structure. + */ + dbus_message_unref(self->msg); + self->msg = NULL; +err: + Py_CLEAR(signature_obj); + return NULL; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/message-get-args.c b/_dbus_bindings/message-get-args.c new file mode 100644 index 0000000..49670c1 --- /dev/null +++ b/_dbus_bindings/message-get-args.c @@ -0,0 +1,558 @@ +/* D-Bus Message unserialization. This contains all the logic to map from + * D-Bus types to Python objects. + * + * Copyright (C) 2006-2007 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#define DBG_IS_TOO_VERBOSE +#include "compat-internal.h" +#include "types-internal.h" +#include "message-internal.h" + +char dbus_py_Message_get_args_list__doc__[] = ( +"get_args_list(**kwargs) -> list\n\n" +"Return the message's arguments. Keyword arguments control the translation\n" +"of D-Bus types to Python:\n" +"\n" +":Keywords:\n" +" `byte_arrays` : bool\n" +" If true, convert arrays of byte (signature 'ay') into dbus.ByteArray,\n" +" a str subclass. In practice, this is usually what you want, but\n" +" it's off by default for consistency.\n" +"\n" +" If false (default), convert them into a dbus.Array of Bytes.\n" +#ifndef PY3 +" `utf8_strings` : bool\n" +" If true, return D-Bus strings as Python 8-bit strings (of UTF-8).\n" +" If false (default), return D-Bus strings as Python unicode objects.\n" +#endif +"\n" +"Most of the type mappings should be fairly obvious:\n" +"\n" +"=============== ===================================================\n" +"D-Bus Python\n" +"=============== ===================================================\n" +"byte (y) dbus.Byte (int subclass)\n" +"bool (b) dbus.Boolean (int subclass)\n" +"Signature (g) dbus.Signature (str subclass)\n" +"intNN, uintNN dbus.IntNN, dbus.UIntNN (int or long subclasses)\n" +"double (d) dbus.Double\n" +"string (s) dbus.String (unicode subclass)\n" +" (or dbus.UTF8String, str subclass, if utf8_strings set)\n" +"Object path (o) dbus.ObjectPath (str subclass)\n" +"dict (a{...}) dbus.Dictionary\n" +"array (a...) dbus.Array (list subclass) containing appropriate types\n" +"byte array (ay) dbus.ByteArray (str subclass) if byte_arrays set; or\n" +" list of Byte\n" +"struct ((...)) dbus.Struct (tuple subclass) of appropriate types\n" +"variant (v) contained type, but with variant_level > 0\n" +"=============== ===================================================\n" +); + +typedef struct { + int byte_arrays; +#ifndef PY3 + int utf8_strings; +#endif +} Message_get_args_options; + +static PyObject *_message_iter_get_pyobject(DBusMessageIter *iter, + Message_get_args_options *opts, + long extra_variants); + +/* Append all the items iterated over to the given Python list object. + * Return 0 on success/-1 with exception on failure. */ +static int +_message_iter_append_all_to_list(DBusMessageIter *iter, PyObject *list, + Message_get_args_options *opts) +{ + int ret, type; + while ((type = dbus_message_iter_get_arg_type(iter)) + != DBUS_TYPE_INVALID) { + PyObject *item; + DBG("type == %d '%c'", type, type); + + item = _message_iter_get_pyobject(iter, opts, 0); + if (!item) return -1; +#ifdef USING_DBG + fprintf(stderr, "DBG/%ld: appending to list: %p == ", (long)getpid(), item); + PyObject_Print(item, stderr, 0); + fprintf(stderr, " of type %p\n", Py_TYPE(item)); +#endif + ret = PyList_Append(list, item); + Py_CLEAR(item); + if (ret < 0) return -1; +#ifdef USING_DBG + fprintf(stderr, "DBG/%ld: list now contains: ", (long)getpid()); + PyObject_Print(list, stderr, 0); + fprintf(stderr, "\n"); +#endif + dbus_message_iter_next(iter); + } + return 0; +} + +static inline PyObject * +_message_iter_get_dict(DBusMessageIter *iter, + Message_get_args_options *opts, + PyObject *kwargs) +{ + DBusMessageIter entries; + char *sig_str = dbus_message_iter_get_signature(iter); + PyObject *sig; + PyObject *ret; + int status; + + if (!sig_str) { + PyErr_NoMemory(); + return NULL; + } + sig = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, + "(s#)", sig_str+2, + (Py_ssize_t)strlen(sig_str)-3); + dbus_free(sig_str); + if (!sig) { + return NULL; + } + status = PyDict_SetItem(kwargs, dbus_py_signature_const, sig); + Py_CLEAR(sig); + if (status < 0) { + return NULL; + } + + ret = PyObject_Call((PyObject *)&DBusPyDict_Type, dbus_py_empty_tuple, kwargs); + if (!ret) { + return NULL; + } + + dbus_message_iter_recurse(iter, &entries); + while (dbus_message_iter_get_arg_type(&entries) == DBUS_TYPE_DICT_ENTRY) { + PyObject *key = NULL; + PyObject *value = NULL; + DBusMessageIter kv; + + DBG("%s", "dict entry..."); + + dbus_message_iter_recurse(&entries, &kv); + + key = _message_iter_get_pyobject(&kv, opts, 0); + if (!key) { + Py_CLEAR(ret); + return NULL; + } + dbus_message_iter_next(&kv); + + value = _message_iter_get_pyobject(&kv, opts, 0); + if (!value) { + Py_CLEAR(key); + Py_CLEAR(ret); + return NULL; + } + + status = PyDict_SetItem(ret, key, value); + Py_CLEAR(key); + Py_CLEAR(value); + + if (status < 0) { + Py_CLEAR(ret); + return NULL; + } + dbus_message_iter_next(&entries); + } + + return ret; +} + +/* Returns a new reference. */ +static PyObject * +_message_iter_get_pyobject(DBusMessageIter *iter, + Message_get_args_options *opts, + long variant_level) +{ + DBusBasicValue u; + int type = dbus_message_iter_get_arg_type(iter); + PyObject *args = NULL; + PyObject *kwargs = NULL; + PyObject *ret = NULL; + + /* If the variant-level is >0, prepare a dict for the kwargs. + * For variant wrappers optimize slightly by skipping this. + */ + if (variant_level > 0 && type != DBUS_TYPE_VARIANT) { + PyObject *variant_level_int; + + variant_level_int = NATIVEINT_FROMLONG(variant_level); + if (!variant_level_int) { + return NULL; + } + kwargs = PyDict_New(); + if (!kwargs) { + Py_CLEAR(variant_level_int); + return NULL; + } + if (PyDict_SetItem(kwargs, dbus_py_variant_level_const, + variant_level_int) < 0) { + Py_CLEAR(variant_level_int); + Py_CLEAR(kwargs); + return NULL; + } + Py_CLEAR(variant_level_int); + } + /* From here down you need to break from the switch to exit, so the + * dict is freed if necessary + */ + + switch (type) { + PyObject *unicode; + + case DBUS_TYPE_STRING: + DBG("%s", "found a string"); + dbus_message_iter_get_basic(iter, &u.str); +#ifndef PY3 + if (opts->utf8_strings) { + args = Py_BuildValue("(s)", u.str); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyUTF8String_Type, + args, kwargs); + } + else { +#endif + unicode = PyUnicode_DecodeUTF8(u.str, strlen(u.str), NULL); + if (!unicode) { + break; + } + args = Py_BuildValue("(N)", unicode); + if (!args) { + break; + } + ret = PyObject_Call((PyObject *)&DBusPyString_Type, + args, kwargs); +#ifndef PY3 + } +#endif + break; + + case DBUS_TYPE_SIGNATURE: + DBG("%s", "found a signature"); + dbus_message_iter_get_basic(iter, &u.str); + args = Py_BuildValue("(s)", u.str); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPySignature_Type, args, kwargs); + break; + + case DBUS_TYPE_OBJECT_PATH: + DBG("%s", "found an object path"); + dbus_message_iter_get_basic(iter, &u.str); + args = Py_BuildValue("(s)", u.str); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyObjectPath_Type, args, kwargs); + break; + + case DBUS_TYPE_DOUBLE: + DBG("%s", "found a double"); + dbus_message_iter_get_basic(iter, &u.dbl); + args = Py_BuildValue("(f)", u.dbl); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyDouble_Type, args, kwargs); + break; + +#ifdef WITH_DBUS_FLOAT32 + case DBUS_TYPE_FLOAT: + DBG("%s", "found a float"); + /* FIXME: DBusBasicValue will need to grow a float member if + * float32 becomes supported */ + dbus_message_iter_get_basic(iter, &u.f); + args = Py_BuildValue("(f)", (double)u.f); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyFloat_Type, args, kwargs); + break; +#endif + + case DBUS_TYPE_INT16: + DBG("%s", "found an int16"); + dbus_message_iter_get_basic(iter, &u.i16); + args = Py_BuildValue("(i)", (int)u.i16); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyInt16_Type, args, kwargs); + break; + + case DBUS_TYPE_UINT16: + DBG("%s", "found a uint16"); + dbus_message_iter_get_basic(iter, &u.u16); + args = Py_BuildValue("(i)", (int)u.u16); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyUInt16_Type, args, kwargs); + break; + + case DBUS_TYPE_INT32: + DBG("%s", "found an int32"); + dbus_message_iter_get_basic(iter, &u.i32); + args = Py_BuildValue("(l)", (long)u.i32); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyInt32_Type, args, kwargs); + break; + + case DBUS_TYPE_UINT32: + DBG("%s", "found a uint32"); + dbus_message_iter_get_basic(iter, &u.u32); + args = Py_BuildValue("(k)", (unsigned long)u.u32); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyUInt32_Type, args, kwargs); + break; + +#ifdef DBUS_TYPE_UNIX_FD + case DBUS_TYPE_UNIX_FD: + DBG("%s", "found an unix fd"); + dbus_message_iter_get_basic(iter, &u.fd); + args = Py_BuildValue("(i)", u.fd); + if (args) { + ret = PyObject_Call((PyObject *)&DBusPyUnixFd_Type, args, + kwargs); + } + if (u.fd >= 0) { + close(u.fd); + } + break; +#endif + +#if defined(DBUS_HAVE_INT64) && defined(HAVE_LONG_LONG) + case DBUS_TYPE_INT64: + DBG("%s", "found an int64"); + dbus_message_iter_get_basic(iter, &u.i64); + args = Py_BuildValue("(L)", (PY_LONG_LONG)u.i64); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyInt64_Type, args, kwargs); + break; + + case DBUS_TYPE_UINT64: + DBG("%s", "found a uint64"); + dbus_message_iter_get_basic(iter, &u.u64); + args = Py_BuildValue("(K)", (unsigned PY_LONG_LONG)u.u64); + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyUInt64_Type, args, kwargs); + break; +#else + case DBUS_TYPE_INT64: + case DBUS_TYPE_UINT64: + PyErr_SetString(PyExc_NotImplementedError, + "64-bit integer types are not supported on " + "this platform"); + break; +#endif + + case DBUS_TYPE_BYTE: + DBG("%s", "found a byte"); + dbus_message_iter_get_basic(iter, &u.byt); + args = Py_BuildValue("(l)", (long)u.byt); + if (!args) + break; + ret = PyObject_Call((PyObject *)&DBusPyByte_Type, args, kwargs); + break; + + case DBUS_TYPE_BOOLEAN: + DBG("%s", "found a bool"); + dbus_message_iter_get_basic(iter, &u.bool_val); + args = Py_BuildValue("(l)", (long)u.bool_val); + if (!args) + break; + ret = PyObject_Call((PyObject *)&DBusPyBoolean_Type, args, kwargs); + break; + + case DBUS_TYPE_ARRAY: + DBG("%s", "found an array..."); + /* Dicts are arrays of DBUS_TYPE_DICT_ENTRY on the wire. + Also, we special-case arrays of DBUS_TYPE_BYTE sometimes. */ + type = dbus_message_iter_get_element_type(iter); + if (type == DBUS_TYPE_DICT_ENTRY) { + DBG("%s", "no, actually it's a dict..."); + if (!kwargs) { + kwargs = PyDict_New(); + if (!kwargs) break; + } + ret = _message_iter_get_dict(iter, opts, kwargs); + } + else if (opts->byte_arrays && type == DBUS_TYPE_BYTE) { + DBusMessageIter sub; + int n; + + DBG("%s", "actually, a byte array..."); + dbus_message_iter_recurse(iter, &sub); + dbus_message_iter_get_fixed_array(&sub, + (const unsigned char **)&u.str, + &n); + if (n == 0 && u.str == NULL) { + /* fd.o #21831: s# turns (NULL, 0) into None, but + * dbus_message_iter_get_fixed_array produces (NULL, 0) + * for an empty byte-blob... */ + u.str = ""; + } +#ifdef PY3 + args = Py_BuildValue("(y#)", u.str, (Py_ssize_t)n); +#else + args = Py_BuildValue("(s#)", u.str, (Py_ssize_t)n); +#endif + if (!args) break; + ret = PyObject_Call((PyObject *)&DBusPyByteArray_Type, + args, kwargs); + } + else { + DBusMessageIter sub; + char *sig; + PyObject *sig_obj; + int status; + + DBG("%s", "a normal array..."); + if (!kwargs) { + kwargs = PyDict_New(); + if (!kwargs) break; + } + dbus_message_iter_recurse(iter, &sub); + sig = dbus_message_iter_get_signature(&sub); + if (!sig) break; + sig_obj = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, + "(s)", sig); + dbus_free(sig); + if (!sig_obj) break; + status = PyDict_SetItem(kwargs, dbus_py_signature_const, sig_obj); + Py_CLEAR(sig_obj); + if (status < 0) break; + ret = PyObject_Call((PyObject *)&DBusPyArray_Type, + dbus_py_empty_tuple, kwargs); + if (!ret) break; + if (_message_iter_append_all_to_list(&sub, ret, opts) < 0) { + Py_CLEAR(ret); + } + } + break; + + case DBUS_TYPE_STRUCT: + { + DBusMessageIter sub; + PyObject *list = PyList_New(0); + PyObject *tuple; + + DBG("%s", "found a struct..."); + if (!list) break; + dbus_message_iter_recurse(iter, &sub); + if (_message_iter_append_all_to_list(&sub, list, opts) < 0) { + Py_CLEAR(list); + break; + } + tuple = Py_BuildValue("(O)", list); + if (tuple) { + ret = PyObject_Call((PyObject *)&DBusPyStruct_Type, tuple, kwargs); + } + else { + ret = NULL; + } + /* whether successful or not, we take the same action: */ + Py_CLEAR(list); + Py_CLEAR(tuple); + } + break; + + case DBUS_TYPE_VARIANT: + { + DBusMessageIter sub; + + DBG("%s", "found a variant..."); + dbus_message_iter_recurse(iter, &sub); + ret = _message_iter_get_pyobject(&sub, opts, variant_level+1); + } + break; + + default: + PyErr_Format(PyExc_TypeError, "Unknown type '\\%x' in D-Bus " + "message", type); + } + + Py_CLEAR(args); + Py_CLEAR(kwargs); + return ret; +} + +PyObject * +dbus_py_Message_get_args_list(Message *self, PyObject *args, PyObject *kwargs) +{ +#ifdef PY3 + Message_get_args_options opts = { 0 }; + static char *argnames[] = { "byte_arrays", NULL }; +#else + Message_get_args_options opts = { 0, 0 }; + static char *argnames[] = { "byte_arrays", "utf8_strings", NULL }; +#endif + PyObject *list; + DBusMessageIter iter; + +#ifdef USING_DBG + fprintf(stderr, "DBG/%ld: called Message_get_args_list(self, *", + (long)getpid()); + PyObject_Print(args, stderr, 0); + if (kwargs) { + fprintf(stderr, ", **"); + PyObject_Print(kwargs, stderr, 0); + } + fprintf(stderr, ")\n"); +#endif + + if (PyTuple_Size(args) != 0) { + PyErr_SetString(PyExc_TypeError, "get_args_list takes no positional " + "arguments"); + return NULL; + } +#ifdef PY3 + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:get_args_list", + argnames, + &(opts.byte_arrays))) return NULL; +#else + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii:get_args_list", + argnames, + &(opts.byte_arrays), + &(opts.utf8_strings))) return NULL; +#endif + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + + list = PyList_New(0); + if (!list) return NULL; + + /* Iterate over args, if any, appending to list */ + if (dbus_message_iter_init(self->msg, &iter)) { + if (_message_iter_append_all_to_list(&iter, list, &opts) < 0) { + Py_CLEAR(list); + DBG_EXC("%s", "Message_get_args: appending all to list failed:"); + return NULL; + } + } + +#ifdef USING_DBG + fprintf(stderr, "DBG/%ld: message has args list ", (long)getpid()); + PyObject_Print(list, stderr, 0); + fprintf(stderr, "\n"); +#endif + + return list; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/message-internal.h b/_dbus_bindings/message-internal.h new file mode 100644 index 0000000..dfa78e0 --- /dev/null +++ b/_dbus_bindings/message-internal.h @@ -0,0 +1,49 @@ +/* D-Bus message: implementation internals + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef DBUS_BINDINGS_MESSAGE_INTERNAL_H +#define DBUS_BINDINGS_MESSAGE_INTERNAL_H + +#include "dbus_bindings-internal.h" + +#include + +typedef struct { + PyObject_HEAD + DBusMessage *msg; +} Message; + +extern char dbus_py_Message_append__doc__[]; +extern PyObject *dbus_py_Message_append(Message *, PyObject *, PyObject *); +extern char dbus_py_Message_guess_signature__doc__[]; +extern PyObject *dbus_py_Message_guess_signature(PyObject *, PyObject *); +extern char dbus_py_Message_get_args_list__doc__[]; +extern PyObject *dbus_py_Message_get_args_list(Message *, + PyObject *, + PyObject *); + +extern PyObject *DBusPy_RaiseUnusableMessage(void); + +#endif diff --git a/_dbus_bindings/message.c b/_dbus_bindings/message.c new file mode 100644 index 0000000..ded8fe1 --- /dev/null +++ b/_dbus_bindings/message.c @@ -0,0 +1,1110 @@ +/* Implementation of D-Bus Message and subclasses (but see message-get-args.h + * and message-append.h for unserialization and serialization code). + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" +#include "message-internal.h" + +static PyTypeObject MessageType, SignalMessageType, ErrorMessageType; +static PyTypeObject MethodReturnMessageType, MethodCallMessageType; + +static inline int Message_Check(PyObject *o) +{ + return (Py_TYPE(o) == &MessageType) + || PyObject_IsInstance(o, (PyObject *)&MessageType); +} + +PyObject * +DBusPy_RaiseUnusableMessage(void) +{ + DBusPyException_SetString("Message object is uninitialized, or has become " + "unusable due to error while appending " + "arguments"); + return NULL; +} + +PyDoc_STRVAR(Message_tp_doc, +"A message to be sent or received over a D-Bus Connection.\n"); + +static void Message_tp_dealloc(Message *self) +{ + if (self->msg) { + dbus_message_unref(self->msg); + } + Py_TYPE(self)->tp_free((PyObject *)self); +} + +static PyObject * +Message_tp_new(PyTypeObject *type, + PyObject *args UNUSED, + PyObject *kwargs UNUSED) +{ + Message *self; + + self = (Message *)type->tp_alloc(type, 0); + if (!self) return NULL; + self->msg = NULL; + return (PyObject *)self; +} + +static PyObject * +MethodCallMessage_tp_repr(PyObject *self) +{ + DBusMessage *msg = ((Message *)self)->msg; + const char *destination = dbus_message_get_destination(msg); + const char *path = dbus_message_get_path(msg); + const char *interface = dbus_message_get_interface(msg); + const char *member = dbus_message_get_member(msg); + + if (!path) + path = "n/a"; + if (!interface) + interface = "n/a"; + if (!member) + member = "n/a"; + if (!destination) + destination = "n/a"; + + return PyUnicode_FromFormat( + "<%s path: %s, iface: %s, member: %s dest: %s>", + Py_TYPE(self)->tp_name, + path, interface, member, destination); +} + +PyDoc_STRVAR(MethodCallMessage_tp_doc, "A method-call message.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.lowlevel.MethodCallMessage(destination: str or None, path: str,\n" +" interface: str or None, method: str)\n" +"\n" +"``destination`` is the destination bus name, or None to send the\n" +"message directly to the peer (usually the bus daemon).\n" +"\n" +"``path`` is the object-path of the object whose method is to be called.\n" +"\n" +"``interface`` is the interface qualifying the method name, or None to omit\n" +"the interface from the message header.\n" +"\n" +"``method`` is the method name (member name).\n" +); + +static int +MethodCallMessage_tp_init(Message *self, PyObject *args, PyObject *kwargs) +{ + const char *destination, *path, *interface, *method; + static char *kwlist[] = {"destination", "path", "interface", "method", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "zszs:__init__", kwlist, + &destination, &path, &interface, + &method)) { + return -1; + } + if (destination && !dbus_py_validate_bus_name(destination, 1, 1)) return -1; + if (!dbus_py_validate_object_path(path)) return -1; + if (interface && !dbus_py_validate_interface_name(interface)) return -1; + if (!dbus_py_validate_member_name(method)) return -1; + if (self->msg) { + dbus_message_unref(self->msg); + self->msg = NULL; + } + self->msg = dbus_message_new_method_call(destination, path, interface, + method); + if (!self->msg) { + PyErr_NoMemory(); + return -1; + } + return 0; +} + +PyDoc_STRVAR(MethodReturnMessage_tp_doc, "A method-return message.\n\n" +"Constructor::\n\n" +" dbus.lowlevel.MethodReturnMessage(method_call: MethodCallMessage)\n"); + +static int +MethodReturnMessage_tp_init(Message *self, PyObject *args, PyObject *kwargs) +{ + Message *other; + static char *kwlist[] = {"method_call", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:__init__", kwlist, + &MessageType, &other)) { + return -1; + } + if (self->msg) { + dbus_message_unref(self->msg); + self->msg = NULL; + } + self->msg = dbus_message_new_method_return(other->msg); + if (!self->msg) { + PyErr_NoMemory(); + return -1; + } + return 0; +} + +PyDoc_STRVAR(SignalMessage_tp_doc, "A signal message.\n\n" +"Constructor::\n\n" +" dbus.lowlevel.SignalMessage(path: str, interface: str, method: str)\n"); +static int +SignalMessage_tp_init(Message *self, PyObject *args, PyObject *kwargs) +{ + const char *path, *interface, *name; + static char *kwlist[] = {"path", "interface", "name", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss:__init__", kwlist, + &path, &interface, &name)) { + return -1; + } + if (!dbus_py_validate_object_path(path)) return -1; + if (!dbus_py_validate_interface_name(interface)) return -1; + if (!dbus_py_validate_member_name(name)) return -1; + if (self->msg) { + dbus_message_unref(self->msg); + self->msg = NULL; + } + self->msg = dbus_message_new_signal(path, interface, name); + if (!self->msg) { + PyErr_NoMemory(); + return -1; + } + return 0; +} + +static PyObject * +SignalMessage_tp_repr(PyObject *self) +{ + DBusMessage *msg = ((Message *)self)->msg; + const char *path = dbus_message_get_path(msg); + const char *interface = dbus_message_get_interface(msg); + const char *member = dbus_message_get_member(msg); + const char *destination = dbus_message_get_destination(msg); + + if (!path) + path = "n/a"; + if (!interface) + interface = "n/a"; + if (!member) + member = "n/a"; + if (!destination) + destination = "(broadcast)"; + + return PyUnicode_FromFormat("<%s path: %s, iface: %s, member: %s, dest: %s>", + Py_TYPE(self)->tp_name, + path, interface, member, destination); +} + +PyDoc_STRVAR(ErrorMessage_tp_doc, "An error message.\n\n" +"Constructor::\n\n" +" dbus.lowlevel.ErrorMessage(reply_to: Message, error_name: str,\n" +" error_message: str or None)\n"); +static int +ErrorMessage_tp_init(Message *self, PyObject *args, PyObject *kwargs) +{ + Message *reply_to; + const char *error_name, *error_message; + static char *kwlist[] = {"reply_to", "error_name", "error_message", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!sz:__init__", kwlist, + &MessageType, &reply_to, &error_name, + &error_message)) { + return -1; + } + if (!dbus_py_validate_error_name(error_name)) return -1; + if (self->msg) { + dbus_message_unref(self->msg); + self->msg = NULL; + } + self->msg = dbus_message_new_error(reply_to->msg, error_name, error_message); + if (!self->msg) { + PyErr_NoMemory(); + return -1; + } + return 0; +} + +DBusMessage * +DBusPyMessage_BorrowDBusMessage(PyObject *msg) +{ + if (!Message_Check(msg)) { + PyErr_SetString(PyExc_TypeError, + "A dbus.lowlevel.Message instance is required"); + return NULL; + } + if (!((Message *)msg)->msg) { + DBusPy_RaiseUnusableMessage(); + return NULL; + } + return ((Message *)msg)->msg; +} + +PyObject * +DBusPyMessage_ConsumeDBusMessage(DBusMessage *msg) +{ + PyTypeObject *type; + Message *self; + + switch (dbus_message_get_type(msg)) { + case DBUS_MESSAGE_TYPE_METHOD_CALL: + type = &MethodCallMessageType; + break; + case DBUS_MESSAGE_TYPE_METHOD_RETURN: + type = &MethodReturnMessageType; + break; + case DBUS_MESSAGE_TYPE_ERROR: + type = &ErrorMessageType; + break; + case DBUS_MESSAGE_TYPE_SIGNAL: + type = &SignalMessageType; + break; + default: + type = &MessageType; + } + + self = (Message *)(type->tp_new) (type, dbus_py_empty_tuple, NULL); + if (!self) { + dbus_message_unref(msg); + return NULL; + } + self->msg = msg; + return (PyObject *)self; +} + +PyDoc_STRVAR(Message_copy__doc__, +"message.copy() -> Message (or subclass)\n" +"Deep-copy the message, resetting the serial number to zero.\n"); +static PyObject * +Message_copy(Message *self, PyObject *args UNUSED) +{ + DBusMessage *msg; + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + msg = dbus_message_copy(self->msg); + if (!msg) return PyErr_NoMemory(); + return DBusPyMessage_ConsumeDBusMessage(msg); +} + +PyDoc_STRVAR(Message_get_auto_start__doc__, +"message.get_auto_start() -> bool\n" +"Return true if this message will cause an owner for the destination name\n" +"to be auto-started.\n"); +static PyObject * +Message_get_auto_start(Message *self, PyObject *unused UNUSED) +{ + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_get_auto_start(self->msg)); +} + +PyDoc_STRVAR(Message_set_auto_start__doc__, +"message.set_auto_start(bool) -> None\n" +"Set whether this message will cause an owner for the destination name\n" +"to be auto-started.\n"); +static PyObject * +Message_set_auto_start(Message *self, PyObject *args) +{ + int value; + if (!PyArg_ParseTuple(args, "i", &value)) return NULL; + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + dbus_message_set_auto_start(self->msg, value ? TRUE : FALSE); + Py_INCREF(Py_None); + return Py_None; +} + +PyDoc_STRVAR(Message_get_no_reply__doc__, +"message.get_no_reply() -> bool\n" +"Return true if this message need not be replied to.\n"); +static PyObject * +Message_get_no_reply(Message *self, PyObject *unused UNUSED) +{ + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_get_no_reply(self->msg)); +} + +PyDoc_STRVAR(Message_set_no_reply__doc__, +"message.set_no_reply(bool) -> None\n" +"Set whether no reply to this message is required.\n"); +static PyObject * +Message_set_no_reply(Message *self, PyObject *args) +{ + int value; + if (!PyArg_ParseTuple(args, "i", &value)) return NULL; + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + dbus_message_set_no_reply(self->msg, value ? TRUE : FALSE); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Message_get_reply_serial__doc__, +"message.get_reply_serial() -> long\n" +"Returns the serial that the message is a reply to or 0 if none.\n"); +static PyObject * +Message_get_reply_serial(Message *self, PyObject *unused UNUSED) +{ + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyLong_FromUnsignedLong(dbus_message_get_reply_serial(self->msg)); +} + +PyDoc_STRVAR(Message_set_reply_serial__doc__, +"message.set_reply_serial(bool) -> None\n" +"Set the serial that this message is a reply to.\n"); +static PyObject * +Message_set_reply_serial(Message *self, PyObject *args) +{ + dbus_uint32_t value; + + if (!PyArg_ParseTuple(args, "k", &value)) return NULL; + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_message_set_reply_serial(self->msg, value)) { + return PyErr_NoMemory(); + } + Py_INCREF(Py_None); + return Py_None; +} + +PyDoc_STRVAR(Message_get_type__doc__, +"message.get_type() -> int\n\n" +"Returns the type of the message.\n"); +static PyObject * +Message_get_type(Message *self, PyObject *unused UNUSED) +{ + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return NATIVEINT_FROMLONG(dbus_message_get_type(self->msg)); +} + +PyDoc_STRVAR(Message_get_serial__doc__, +"message.get_serial() -> long\n" +"Returns the serial of a message or 0 if none has been specified.\n" +"\n" +"The message's serial number is provided by the application sending the\n" +"message and is used to identify replies to this message. All messages\n" +"received on a connection will have a serial, but messages you haven't\n" +"sent yet may return 0.\n"); +static PyObject * +Message_get_serial(Message *self, PyObject *unused UNUSED) +{ + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyLong_FromUnsignedLong(dbus_message_get_serial(self->msg)); +} + +PyDoc_STRVAR(Message_is_method_call__doc__, +"is_method_call(interface: str, member: str) -> bool"); +static PyObject * +Message_is_method_call(Message *self, PyObject *args) +{ + const char *interface, *method; + + if (!PyArg_ParseTuple(args, "ss:is_method_call", &interface, &method)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_is_method_call(self->msg, interface, + method)); +} + +PyDoc_STRVAR(Message_is_error__doc__, +"is_error(error: str) -> bool"); +static PyObject * +Message_is_error(Message *self, PyObject *args) +{ + const char *error_name; + + if (!PyArg_ParseTuple(args, "s:is_error", &error_name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_is_error(self->msg, error_name)); +} + +PyDoc_STRVAR(Message_is_signal__doc__, +"is_signal(interface: str, member: str) -> bool"); +static PyObject * +Message_is_signal(Message *self, PyObject *args) +{ + const char *interface, *signal_name; + + if (!PyArg_ParseTuple(args, "ss:is_signal", &interface, &signal_name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_is_signal(self->msg, interface, + signal_name)); +} + +PyDoc_STRVAR(Message_get_member__doc__, +"get_member() -> str or None"); +static PyObject * +Message_get_member(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_member(self->msg); + if (!c_str) { + Py_RETURN_NONE; + } + return NATIVESTR_FROMSTR(c_str); +} + +PyDoc_STRVAR(Message_has_member__doc__, +"has_member(name: str or None) -> bool"); +static PyObject * +Message_has_member(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:has_member", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_has_member(self->msg, name)); +} + +PyDoc_STRVAR(Message_set_member__doc__, +"set_member(unique_name: str or None)"); +static PyObject * +Message_set_member(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:set_member", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_py_validate_member_name(name)) return NULL; + if (!dbus_message_set_member(self->msg, name)) return PyErr_NoMemory(); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Message_get_path__doc__, +"get_path() -> ObjectPath or None\n\n" +"Return the message's destination object path (if it's a method call) or\n" +"source object path (if it's a method reply or a signal) or None (if it\n" +"has no path).\n"); +static PyObject * +Message_get_path(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_path(self->msg); + if (!c_str) { + Py_RETURN_NONE; + } + return PyObject_CallFunction((PyObject *)&DBusPyObjectPath_Type, "(s)", c_str); +} + +PyDoc_STRVAR(Message_get_path_decomposed__doc__, +"get_path_decomposed() -> list of str, or None\n\n" +"Return a list of path components (e.g. /foo/bar -> ['foo','bar'], / -> [])\n" +"or None if the message has no associated path.\n"); +static PyObject * +Message_get_path_decomposed(Message *self, PyObject *unused UNUSED) +{ + char **paths, **ptr; + PyObject *ret = PyList_New(0); + + if (!ret) return NULL; + if (!self->msg) { + Py_CLEAR(ret); + return DBusPy_RaiseUnusableMessage(); + } + if (!dbus_message_get_path_decomposed(self->msg, &paths)) { + Py_CLEAR(ret); + return PyErr_NoMemory(); + } + if (!paths) { + Py_CLEAR(ret); + Py_RETURN_NONE; + } + for (ptr = paths; *ptr; ptr++) { + PyObject *str = NATIVESTR_FROMSTR(*ptr); + + if (!str) { + Py_CLEAR(ret); + break; + } + if (PyList_Append(ret, str) < 0) { + Py_CLEAR(ret); + break; + } + Py_CLEAR(str); + str = NULL; + } + dbus_free_string_array(paths); + return ret; +} + +PyDoc_STRVAR(Message_has_path__doc__, +"has_path(name: str or None) -> bool"); +static PyObject * +Message_has_path(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:has_path", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_has_path(self->msg, name)); +} + +PyDoc_STRVAR(Message_set_path__doc__, +"set_path(name: str or None)"); +static PyObject * +Message_set_path(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:set_path", &name)) return NULL; + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_message_has_path(self->msg, name)) return PyErr_NoMemory(); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Message_get_signature__doc__, +"get_signature() -> Signature or None"); +static PyObject * +Message_get_signature(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_signature(self->msg); + if (!c_str) { + return PyObject_CallFunction((PyObject *)&DBusPySignature_Type, "(s)", ""); + } + return PyObject_CallFunction((PyObject *)&DBusPySignature_Type, "(s)", c_str); +} + +PyDoc_STRVAR(Message_has_signature__doc__, +"has_signature(signature: str) -> bool"); +static PyObject * +Message_has_signature(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "s:has_signature", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_has_signature(self->msg, name)); +} + +PyDoc_STRVAR(Message_get_sender__doc__, +"get_sender() -> str or None\n\n" +"Return the message's sender unique name, or None if none.\n"); +static PyObject * +Message_get_sender(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_sender(self->msg); + if (!c_str) { + Py_RETURN_NONE; + } + return NATIVESTR_FROMSTR(c_str); +} + +PyDoc_STRVAR(Message_has_sender__doc__, +"has_sender(unique_name: str) -> bool"); +static PyObject * +Message_has_sender(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "s:has_sender", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_has_sender(self->msg, name)); +} + +PyDoc_STRVAR(Message_set_sender__doc__, +"set_sender(unique_name: str or None)"); +static PyObject * +Message_set_sender(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:set_sender", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_py_validate_bus_name(name, 1, 1)) return NULL; + if (!dbus_message_set_sender(self->msg, name)) return PyErr_NoMemory(); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Message_get_destination__doc__, +"get_destination() -> str or None\n\n" +"Return the message's destination bus name, or None if none.\n"); +static PyObject * +Message_get_destination(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_destination(self->msg); + if (!c_str) { + Py_RETURN_NONE; + } + return NATIVESTR_FROMSTR(c_str); +} + +PyDoc_STRVAR(Message_has_destination__doc__, +"has_destination(bus_name: str) -> bool"); +static PyObject * +Message_has_destination(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "s:has_destination", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_has_destination(self->msg, name)); +} + +PyDoc_STRVAR(Message_set_destination__doc__, +"set_destination(bus_name: str or None)"); +static PyObject * +Message_set_destination(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:set_destination", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_py_validate_bus_name(name, 1, 1)) return NULL; + if (!dbus_message_set_destination(self->msg, name)) return PyErr_NoMemory(); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Message_get_interface__doc__, +"get_interface() -> str or None"); +static PyObject * +Message_get_interface(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_interface(self->msg); + if (!c_str) { + Py_RETURN_NONE; + } + return NATIVESTR_FROMSTR(c_str); +} + +PyDoc_STRVAR(Message_has_interface__doc__, +"has_interface(interface: str or None) -> bool"); +static PyObject * +Message_has_interface(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:has_interface", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + return PyBool_FromLong(dbus_message_has_interface(self->msg, name)); +} + +PyDoc_STRVAR(Message_set_interface__doc__, +"set_interface(name: str or None)"); +static PyObject * +Message_set_interface(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:set_interface", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_py_validate_interface_name(name)) return NULL; + if (!dbus_message_set_interface(self->msg, name)) return PyErr_NoMemory(); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Message_get_error_name__doc__, +"get_error_name() -> str or None"); +static PyObject * +Message_get_error_name(Message *self, PyObject *unused UNUSED) +{ + const char *c_str; + + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + c_str = dbus_message_get_error_name(self->msg); + if (!c_str) { + Py_RETURN_NONE; + } + return NATIVESTR_FROMSTR(c_str); +} + +PyDoc_STRVAR(Message_set_error_name__doc__, +"set_error_name(name: str or None)"); +static PyObject * +Message_set_error_name(Message *self, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "z:set_error_name", &name)) { + return NULL; + } + if (!self->msg) return DBusPy_RaiseUnusableMessage(); + if (!dbus_py_validate_error_name(name)) return NULL; + if (!dbus_message_set_error_name(self->msg, name)) return PyErr_NoMemory(); + Py_RETURN_NONE; +} + +static PyMethodDef Message_tp_methods[] = { + {"copy", (PyCFunction)Message_copy, + METH_NOARGS, Message_copy__doc__}, + {"is_method_call", (PyCFunction)Message_is_method_call, + METH_VARARGS, Message_is_method_call__doc__}, + {"is_signal", (PyCFunction)Message_is_signal, + METH_VARARGS, Message_is_signal__doc__}, + {"is_error", (PyCFunction)Message_is_error, + METH_VARARGS, Message_is_error__doc__}, + + {"get_args_list", (PyCFunction)dbus_py_Message_get_args_list, + METH_VARARGS|METH_KEYWORDS, dbus_py_Message_get_args_list__doc__}, + {"guess_signature", (PyCFunction)dbus_py_Message_guess_signature, + METH_VARARGS|METH_STATIC, dbus_py_Message_guess_signature__doc__}, + {"append", (PyCFunction)dbus_py_Message_append, + METH_VARARGS|METH_KEYWORDS, dbus_py_Message_append__doc__}, + + {"get_auto_start", (PyCFunction)Message_get_auto_start, + METH_NOARGS, Message_get_auto_start__doc__}, + {"set_auto_start", (PyCFunction)Message_set_auto_start, + METH_VARARGS, Message_set_auto_start__doc__}, + {"get_destination", (PyCFunction)Message_get_destination, + METH_NOARGS, Message_get_destination__doc__}, + {"set_destination", (PyCFunction)Message_set_destination, + METH_VARARGS, Message_set_destination__doc__}, + {"has_destination", (PyCFunction)Message_has_destination, + METH_VARARGS, Message_has_destination__doc__}, + {"get_error_name", (PyCFunction)Message_get_error_name, + METH_NOARGS, Message_get_error_name__doc__}, + {"set_error_name", (PyCFunction)Message_set_error_name, + METH_VARARGS, Message_set_error_name__doc__}, + {"get_interface", (PyCFunction)Message_get_interface, + METH_NOARGS, Message_get_interface__doc__}, + {"set_interface", (PyCFunction)Message_set_interface, + METH_VARARGS, Message_set_interface__doc__}, + {"has_interface", (PyCFunction)Message_has_interface, + METH_VARARGS, Message_has_interface__doc__}, + {"get_member", (PyCFunction)Message_get_member, + METH_NOARGS, Message_get_member__doc__}, + {"set_member", (PyCFunction)Message_set_member, + METH_VARARGS, Message_set_member__doc__}, + {"has_member", (PyCFunction)Message_has_member, + METH_VARARGS, Message_has_member__doc__}, + {"get_path", (PyCFunction)Message_get_path, + METH_NOARGS, Message_get_path__doc__}, + {"get_path_decomposed", (PyCFunction)Message_get_path_decomposed, + METH_NOARGS, Message_get_path_decomposed__doc__}, + {"set_path", (PyCFunction)Message_set_path, + METH_VARARGS, Message_set_path__doc__}, + {"has_path", (PyCFunction)Message_has_path, + METH_VARARGS, Message_has_path__doc__}, + {"get_no_reply", (PyCFunction)Message_get_no_reply, + METH_NOARGS, Message_get_no_reply__doc__}, + {"set_no_reply", (PyCFunction)Message_set_no_reply, + METH_VARARGS, Message_set_no_reply__doc__}, + {"get_reply_serial", (PyCFunction)Message_get_reply_serial, + METH_NOARGS, Message_get_reply_serial__doc__}, + {"set_reply_serial", (PyCFunction)Message_set_reply_serial, + METH_VARARGS, Message_set_reply_serial__doc__}, + {"get_sender", (PyCFunction)Message_get_sender, + METH_NOARGS, Message_get_sender__doc__}, + {"set_sender", (PyCFunction)Message_set_sender, + METH_VARARGS, Message_set_sender__doc__}, + {"has_sender", (PyCFunction)Message_has_sender, + METH_VARARGS, Message_has_sender__doc__}, + {"get_serial", (PyCFunction)Message_get_serial, + METH_NOARGS, Message_get_serial__doc__}, + {"get_signature", (PyCFunction)Message_get_signature, + METH_NOARGS, Message_get_signature__doc__}, + {"has_signature", (PyCFunction)Message_has_signature, + METH_VARARGS, Message_has_signature__doc__}, + {"get_type", (PyCFunction)Message_get_type, + METH_NOARGS, Message_get_type__doc__}, + {NULL, NULL, 0, NULL} +}; + +static PyTypeObject MessageType = { + PyVarObject_HEAD_INIT(NULL, 0) + "dbus.lowlevel.Message", /*tp_name*/ + sizeof(Message), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Message_tp_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ + Message_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Message_tp_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Message_tp_new, /* tp_new */ +}; + +static PyTypeObject MethodCallMessageType = { + PyVarObject_HEAD_INIT(NULL, 0) + "dbus.lowlevel.MethodCallMessage", /*tp_name*/ + 0, /*tp_basicsize*/ + 0, /*tp_itemsize*/ + 0, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + MethodCallMessage_tp_repr, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ + MethodCallMessage_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&MessageType), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)MethodCallMessage_tp_init, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +static PyTypeObject MethodReturnMessageType = { + PyVarObject_HEAD_INIT(NULL, 0) + "dbus.lowlevel.MethodReturnMessage", /*tp_name*/ + 0, /*tp_basicsize*/ + 0, /*tp_itemsize*/ + 0, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ + MethodReturnMessage_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&MessageType), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)MethodReturnMessage_tp_init, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +static PyTypeObject SignalMessageType = { + PyVarObject_HEAD_INIT(NULL, 0) + "dbus.lowlevel.SignalMessage", /*tp_name*/ + 0, /*tp_basicsize*/ + 0, /*tp_itemsize*/ + 0, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + SignalMessage_tp_repr, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ + SignalMessage_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&MessageType), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)SignalMessage_tp_init, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +static PyTypeObject ErrorMessageType = { + PyVarObject_HEAD_INIT(NULL, 0) + "dbus.lowlevel.ErrorMessage", /*tp_name*/ + 0, /*tp_basicsize*/ + 0, /*tp_itemsize*/ + 0, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ + ErrorMessage_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&MessageType), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)ErrorMessage_tp_init, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_message_types(void) +{ + if (PyType_Ready(&MessageType) < 0) return 0; + + MethodCallMessageType.tp_base = &MessageType; + if (PyType_Ready(&MethodCallMessageType) < 0) return 0; + + MethodReturnMessageType.tp_base = &MessageType; + if (PyType_Ready(&MethodReturnMessageType) < 0) return 0; + + SignalMessageType.tp_base = &MessageType; + if (PyType_Ready(&SignalMessageType) < 0) return 0; + + ErrorMessageType.tp_base = &MessageType; + if (PyType_Ready(&ErrorMessageType) < 0) return 0; + + return 1; +} + +dbus_bool_t +dbus_py_insert_message_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF (&MessageType); + Py_INCREF (&MethodCallMessageType); + Py_INCREF (&MethodReturnMessageType); + Py_INCREF (&ErrorMessageType); + Py_INCREF (&SignalMessageType); + + if (PyModule_AddObject(this_module, "Message", + (PyObject *)&MessageType) < 0) return 0; + + if (PyModule_AddObject(this_module, "MethodCallMessage", + (PyObject *)&MethodCallMessageType) < 0) return 0; + + if (PyModule_AddObject(this_module, "MethodReturnMessage", + (PyObject *)&MethodReturnMessageType) < 0) return 0; + + if (PyModule_AddObject(this_module, "ErrorMessage", + (PyObject *)&ErrorMessageType) < 0) return 0; + + if (PyModule_AddObject(this_module, "SignalMessage", + (PyObject *)&SignalMessageType) < 0) return 0; + + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/module.c b/_dbus_bindings/module.c new file mode 100644 index 0000000..5b8851c --- /dev/null +++ b/_dbus_bindings/module.c @@ -0,0 +1,432 @@ +/* Main module source for the _dbus_bindings extension. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include +#include + +PyDoc_STRVAR(module_doc, +"Low-level Python bindings for libdbus. Don't use this module directly -\n" +"the public API is provided by the `dbus`, `dbus.service`, `dbus.mainloop`\n" +"and `dbus.mainloop.glib` modules, with a lower-level API provided by the\n" +"`dbus.lowlevel` module.\n" +); + +/* Global functions - validation wrappers ===========================*/ + +PyDoc_STRVAR(validate_bus_name__doc__, +"validate_bus_name(name, allow_unique=True, allow_well_known=True)\n" +"\n" +"Raise ValueError if the argument is not a valid bus name.\n" +"\n" +"By default both unique and well-known names are accepted.\n" +"\n" +":Parameters:\n" +" `name` : str\n" +" The name to be validated\n" +" `allow_unique` : bool\n" +" If False, unique names of the form :1.123 will be rejected\n" +" `allow_well_known` : bool\n" +" If False, well-known names of the form com.example.Foo\n" +" will be rejected\n" +":Since: 0.80\n" +); + +static PyObject * +validate_bus_name(PyObject *unused UNUSED, PyObject *args, PyObject *kwargs) +{ + const char *name; + int allow_unique = 1; + int allow_well_known = 1; + static char *argnames[] = { "name", "allow_unique", "allow_well_known", + NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "s|ii:validate_bus_name", argnames, + &name, &allow_unique, + &allow_well_known)) { + return NULL; + } + if (!dbus_py_validate_bus_name(name, !!allow_unique, !!allow_well_known)) { + return NULL; + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(validate_member_name__doc__, +"validate_member_name(name)\n" +"\n" +"Raise ValueError if the argument is not a valid member (signal or method) " +"name.\n" +"\n" +":Since: 0.80\n" +); + +static PyObject * +validate_member_name(PyObject *unused UNUSED, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "s:validate_member_name", &name)) { + return NULL; + } + if (!dbus_py_validate_member_name(name)) { + return NULL; + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(validate_interface_name__doc__, +"validate_interface_name(name)\n\n" +"Raise ValueError if the given string is not a valid interface name.\n" +"\n" +":Since: 0.80\n" +); + +PyDoc_STRVAR(validate_error_name__doc__, +"validate_error_name(name)\n\n" +"Raise ValueError if the given string is not a valid error name.\n" +"\n" +":Since: 0.80\n" +); + +static PyObject * +validate_interface_name(PyObject *unused UNUSED, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "s:validate_interface_name", &name)) { + return NULL; + } + if (!dbus_py_validate_interface_name(name)) { + return NULL; + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(validate_object_path__doc__, +"validate_object_path(name)\n\n" +"Raise ValueError if the given string is not a valid object path.\n" +"\n" +":Since: 0.80\n" +); + +static PyObject * +validate_object_path(PyObject *unused UNUSED, PyObject *args) +{ + const char *name; + + if (!PyArg_ParseTuple(args, "s:validate_object_path", &name)) { + return NULL; + } + if (!dbus_py_validate_object_path(name)) { + return NULL; + } + Py_RETURN_NONE; +} + +/* Global functions - main loop =====================================*/ + +/* The main loop if none is passed to the constructor */ +static PyObject *default_main_loop = NULL; + +/* Return a new reference to the default main loop */ +PyObject * +dbus_py_get_default_main_loop(void) +{ + if (!default_main_loop) { + Py_RETURN_NONE; + } + Py_INCREF(default_main_loop); + return default_main_loop; +} + +PyDoc_STRVAR(get_default_main_loop__doc__, +"get_default_main_loop() -> object\n\n" +"Return the global default dbus-python main loop wrapper, which is used\n" +"when no main loop wrapper is passed to the Connection constructor.\n" +"\n" +"If None, there is no default and you should always pass the mainloop\n" +"parameter to the constructor - if you don't, then asynchronous calls,\n" +"connecting to signals and exporting objects will raise an exception.\n" +"There is no default until set_default_main_loop is called.\n"); +static PyObject * +get_default_main_loop(PyObject *always_null UNUSED, + PyObject *no_args UNUSED) +{ + return dbus_py_get_default_main_loop(); +} + +PyDoc_STRVAR(set_default_main_loop__doc__, +"set_default_main_loop(object)\n\n" +"Change the global default dbus-python main loop wrapper, which is used\n" +"when no main loop wrapper is passed to the Connection constructor.\n" +"\n" +"If None, return to the initial situation: there is no default, and you\n" +"must always pass the mainloop parameter to the constructor.\n" +"\n" +"Two types of main loop wrapper are planned in dbus-python.\n" +"Native main-loop wrappers are instances of `dbus.mainloop.NativeMainLoop`\n" +"supplied by extension modules like `dbus.mainloop.glib`: they have no\n" +"Python API, but connect themselves to ``libdbus`` using native code.\n" + +"Python main-loop wrappers are not yet implemented. They will be objects\n" +"supporting the interface defined by `dbus.mainloop.MainLoop`, with an\n" +"API entirely based on Python methods.\n" +"\n" +); +static PyObject * +set_default_main_loop(PyObject *always_null UNUSED, + PyObject *args) +{ + PyObject *new_loop, *old_loop; + + if (!PyArg_ParseTuple(args, "O", &new_loop)) { + return NULL; + } + if (!dbus_py_check_mainloop_sanity(new_loop)) { + return NULL; + } + old_loop = default_main_loop; + Py_INCREF(new_loop); + default_main_loop = new_loop; + Py_CLEAR(old_loop); + Py_RETURN_NONE; +} + +static PyMethodDef module_functions[] = { +#define ENTRY(name,flags) {#name, (PyCFunction)name, flags, name##__doc__} + ENTRY(validate_interface_name, METH_VARARGS), + ENTRY(validate_member_name, METH_VARARGS), + ENTRY(validate_bus_name, METH_VARARGS|METH_KEYWORDS), + ENTRY(validate_object_path, METH_VARARGS), + ENTRY(set_default_main_loop, METH_VARARGS), + ENTRY(get_default_main_loop, METH_NOARGS), + /* validate_error_name is just implemented as validate_interface_name */ + {"validate_error_name", validate_interface_name, + METH_VARARGS, validate_error_name__doc__}, +#undef ENTRY + {NULL, NULL, 0, NULL} +}; + +PyMODINIT_FUNC +#ifdef PY3 +PyInit__dbus_bindings(void) +#else +init_dbus_bindings(void) +#endif +{ + PyObject *this_module = NULL, *c_api; + static const int API_count = DBUS_BINDINGS_API_COUNT; + static _dbus_py_func_ptr dbus_bindings_API[DBUS_BINDINGS_API_COUNT]; + +#ifdef PY3 + static struct PyModuleDef moduledef = { + PyModuleDef_HEAD_INIT, + "_dbus_bindings", /* m_name */ + module_doc, /* m_doc */ + -1, /* m_size */ + module_functions, /* m_methods */ + NULL, /* m_reload */ + NULL, /* m_traverse */ + NULL, /* m_clear */ + NULL /* m_free */ + }; +#endif + + dbus_bindings_API[0] = (_dbus_py_func_ptr)&API_count; + dbus_bindings_API[1] = (_dbus_py_func_ptr)DBusPyConnection_BorrowDBusConnection; + dbus_bindings_API[2] = (_dbus_py_func_ptr)DBusPyNativeMainLoop_New4; + + default_main_loop = NULL; + + if (!dbus_py_init_generic()) goto init_error; + if (!dbus_py_init_abstract()) goto init_error; + if (!dbus_py_init_signature()) goto init_error; + if (!dbus_py_init_int_types()) goto init_error; + if (!dbus_py_init_unixfd_type()) goto init_error; + if (!dbus_py_init_string_types()) goto init_error; + if (!dbus_py_init_float_types()) goto init_error; + if (!dbus_py_init_container_types()) goto init_error; + if (!dbus_py_init_byte_types()) goto init_error; + if (!dbus_py_init_message_types()) goto init_error; + if (!dbus_py_init_pending_call()) goto init_error; + if (!dbus_py_init_mainloop()) goto init_error; + if (!dbus_py_init_libdbus_conn_types()) goto init_error; + if (!dbus_py_init_conn_types()) goto init_error; + if (!dbus_py_init_server_types()) goto init_error; + +#ifdef PY3 + this_module = PyModule_Create(&moduledef); +#else + this_module = Py_InitModule3("_dbus_bindings", + module_functions, module_doc); +#endif + if (!this_module) goto init_error; + + if (!dbus_py_insert_abstract_types(this_module)) goto init_error; + if (!dbus_py_insert_signature(this_module)) goto init_error; + if (!dbus_py_insert_int_types(this_module)) goto init_error; + if (!dbus_py_insert_unixfd_type(this_module)) goto init_error; + if (!dbus_py_insert_string_types(this_module)) goto init_error; + if (!dbus_py_insert_float_types(this_module)) goto init_error; + if (!dbus_py_insert_container_types(this_module)) goto init_error; + if (!dbus_py_insert_byte_types(this_module)) goto init_error; + if (!dbus_py_insert_message_types(this_module)) goto init_error; + if (!dbus_py_insert_pending_call(this_module)) goto init_error; + if (!dbus_py_insert_mainloop_types(this_module)) goto init_error; + if (!dbus_py_insert_libdbus_conn_types(this_module)) goto init_error; + if (!dbus_py_insert_conn_types(this_module)) goto init_error; + if (!dbus_py_insert_server_types(this_module)) goto init_error; + + if (PyModule_AddStringConstant(this_module, "BUS_DAEMON_NAME", + DBUS_SERVICE_DBUS) < 0) goto init_error; + if (PyModule_AddStringConstant(this_module, "BUS_DAEMON_PATH", + DBUS_PATH_DBUS) < 0) goto init_error; + if (PyModule_AddStringConstant(this_module, "BUS_DAEMON_IFACE", + DBUS_INTERFACE_DBUS) < 0) goto init_error; + if (PyModule_AddStringConstant(this_module, "LOCAL_PATH", + DBUS_PATH_LOCAL) < 0) goto init_error; + if (PyModule_AddStringConstant(this_module, "LOCAL_IFACE", + DBUS_INTERFACE_LOCAL) < 0) goto init_error; + if (PyModule_AddStringConstant(this_module, "INTROSPECTABLE_IFACE", + DBUS_INTERFACE_INTROSPECTABLE) < 0) + goto init_error; + if (PyModule_AddStringConstant(this_module, "PEER_IFACE", + DBUS_INTERFACE_PEER) < 0) goto init_error; + if (PyModule_AddStringConstant(this_module, "PROPERTIES_IFACE", + DBUS_INTERFACE_PROPERTIES) < 0) + goto init_error; + if (PyModule_AddStringConstant(this_module, + "DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER", + DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER) < 0) + goto init_error; + if (PyModule_AddStringConstant(this_module, + "DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER", + DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER) < 0) + goto init_error; + if (PyModule_AddStringConstant(this_module, + "DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE", + DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE) < 0) + goto init_error; + +#define ADD_CONST_VAL(x, v) \ + if (PyModule_AddIntConstant(this_module, x, v) < 0) goto init_error; +#define ADD_CONST_PREFIXED(x) ADD_CONST_VAL(#x, DBUS_##x) +#define ADD_CONST(x) ADD_CONST_VAL(#x, x) + + ADD_CONST(DBUS_START_REPLY_SUCCESS) + ADD_CONST(DBUS_START_REPLY_ALREADY_RUNNING) + + ADD_CONST_PREFIXED(RELEASE_NAME_REPLY_RELEASED) + ADD_CONST_PREFIXED(RELEASE_NAME_REPLY_NON_EXISTENT) + ADD_CONST_PREFIXED(RELEASE_NAME_REPLY_NOT_OWNER) + + ADD_CONST_PREFIXED(REQUEST_NAME_REPLY_PRIMARY_OWNER) + ADD_CONST_PREFIXED(REQUEST_NAME_REPLY_IN_QUEUE) + ADD_CONST_PREFIXED(REQUEST_NAME_REPLY_EXISTS) + ADD_CONST_PREFIXED(REQUEST_NAME_REPLY_ALREADY_OWNER) + + ADD_CONST_PREFIXED(NAME_FLAG_ALLOW_REPLACEMENT) + ADD_CONST_PREFIXED(NAME_FLAG_REPLACE_EXISTING) + ADD_CONST_PREFIXED(NAME_FLAG_DO_NOT_QUEUE) + + ADD_CONST_PREFIXED(BUS_SESSION) + ADD_CONST_PREFIXED(BUS_SYSTEM) + ADD_CONST_PREFIXED(BUS_STARTER) + + ADD_CONST_PREFIXED(MESSAGE_TYPE_INVALID) + ADD_CONST_PREFIXED(MESSAGE_TYPE_METHOD_CALL) + ADD_CONST_PREFIXED(MESSAGE_TYPE_METHOD_RETURN) + ADD_CONST_PREFIXED(MESSAGE_TYPE_ERROR) + ADD_CONST_PREFIXED(MESSAGE_TYPE_SIGNAL) + + ADD_CONST_PREFIXED(TYPE_INVALID) + ADD_CONST_PREFIXED(TYPE_BYTE) + ADD_CONST_PREFIXED(TYPE_BOOLEAN) + ADD_CONST_PREFIXED(TYPE_INT16) + ADD_CONST_PREFIXED(TYPE_UINT16) + ADD_CONST_PREFIXED(TYPE_INT32) +#ifdef DBUS_TYPE_UNIX_FD + ADD_CONST_PREFIXED(TYPE_UNIX_FD) +#endif + ADD_CONST_PREFIXED(TYPE_UINT32) + ADD_CONST_PREFIXED(TYPE_INT64) + ADD_CONST_PREFIXED(TYPE_UINT64) + ADD_CONST_PREFIXED(TYPE_DOUBLE) + ADD_CONST_PREFIXED(TYPE_STRING) + ADD_CONST_PREFIXED(TYPE_OBJECT_PATH) + ADD_CONST_PREFIXED(TYPE_SIGNATURE) + ADD_CONST_PREFIXED(TYPE_ARRAY) + ADD_CONST_PREFIXED(TYPE_STRUCT) + ADD_CONST_VAL("STRUCT_BEGIN", DBUS_STRUCT_BEGIN_CHAR) + ADD_CONST_VAL("STRUCT_END", DBUS_STRUCT_END_CHAR) + ADD_CONST_PREFIXED(TYPE_VARIANT) + ADD_CONST_PREFIXED(TYPE_DICT_ENTRY) + ADD_CONST_VAL("DICT_ENTRY_BEGIN", DBUS_DICT_ENTRY_BEGIN_CHAR) + ADD_CONST_VAL("DICT_ENTRY_END", DBUS_DICT_ENTRY_END_CHAR) + + ADD_CONST_PREFIXED(HANDLER_RESULT_HANDLED) + ADD_CONST_PREFIXED(HANDLER_RESULT_NOT_YET_HANDLED) + ADD_CONST_PREFIXED(HANDLER_RESULT_NEED_MEMORY) + + ADD_CONST_PREFIXED(WATCH_READABLE) + ADD_CONST_PREFIXED(WATCH_WRITABLE) + ADD_CONST_PREFIXED(WATCH_HANGUP) + ADD_CONST_PREFIXED(WATCH_ERROR) + + if (PyModule_AddStringConstant(this_module, "__docformat__", + "restructuredtext") < 0) goto init_error; + + if (PyModule_AddStringConstant(this_module, "__version__", + PACKAGE_VERSION) < 0) goto init_error; + + if (PyModule_AddIntConstant(this_module, "_python_version", + PY_VERSION_HEX) < 0) goto init_error; + +#ifdef PY3 + c_api = PyCapsule_New((void *)dbus_bindings_API, + PYDBUS_CAPSULE_NAME, NULL); +#else + c_api = PyCObject_FromVoidPtr ((void *)dbus_bindings_API, NULL); +#endif + if (!c_api) { + goto init_error; + } + PyModule_AddObject(this_module, "_C_API", c_api); + +#ifdef PY3 + return this_module; + init_error: + Py_CLEAR(this_module); + return NULL; +#else + init_error: + return; +#endif +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/pending-call.c b/_dbus_bindings/pending-call.c new file mode 100644 index 0000000..469c997 --- /dev/null +++ b/_dbus_bindings/pending-call.c @@ -0,0 +1,294 @@ +/* Implementation of PendingCall helper type for D-Bus bindings. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +PyDoc_STRVAR(PendingCall_tp_doc, +"Object representing a pending D-Bus call, returned by\n" +"Connection.send_message_with_reply(). Cannot be instantiated directly.\n" +); + +static PyTypeObject PendingCallType; + +static inline int PendingCall_Check (PyObject *o) +{ + return (Py_TYPE(o) == &PendingCallType) + || PyObject_IsInstance(o, (PyObject *)&PendingCallType); +} + +typedef struct { + PyObject_HEAD + DBusPendingCall *pc; +} PendingCall; + +PyDoc_STRVAR(PendingCall_cancel__doc__, +"cancel()\n\n" +"Cancel this pending call. Its reply will be ignored and the associated\n" +"reply handler will never be called.\n"); +static PyObject * +PendingCall_cancel(PendingCall *self, PyObject *unused UNUSED) +{ + Py_BEGIN_ALLOW_THREADS + dbus_pending_call_cancel(self->pc); + Py_END_ALLOW_THREADS + Py_RETURN_NONE; +} + +PyDoc_STRVAR(PendingCall_block__doc__, +"block()\n\n" +"Block until this pending call has completed and the associated\n" +"reply handler has been called.\n" +"\n" +"This can lead to a deadlock, if the called method tries to make a\n" +"synchronous call to a method in this application.\n"); +static PyObject * +PendingCall_block(PendingCall *self, PyObject *unused UNUSED) +{ + Py_BEGIN_ALLOW_THREADS + dbus_pending_call_block(self->pc); + Py_END_ALLOW_THREADS + Py_RETURN_NONE; +} + +static void +_pending_call_notify_function(DBusPendingCall *pc, + PyObject *list) +{ + PyGILState_STATE gil = PyGILState_Ensure(); + /* BEGIN CRITICAL SECTION + * While holding the GIL, make sure the callback only gets called once + * by deleting it from the 1-item list that's held by libdbus. + */ + PyObject *handler = PyList_GetItem(list, 0); + DBusMessage *msg; + + if (!handler) { + PyErr_Print(); + goto release; + } + if (handler == Py_None) { + /* We've already called (and thrown away) the callback */ + goto release; + } + Py_INCREF(handler); /* previously borrowed from the list, now owned */ + Py_INCREF(Py_None); /* take a ref so SetItem can steal it */ + PyList_SetItem(list, 0, Py_None); + /* END CRITICAL SECTION */ + + msg = dbus_pending_call_steal_reply(pc); + + if (!msg) { + /* omg, what happened here? the notify should only get called + * when we have a reply */ + PyErr_Warn(PyExc_UserWarning, "D-Bus notify function was called " + "for an incomplete pending call (shouldn't happen)"); + } else { + PyObject *msg_obj = DBusPyMessage_ConsumeDBusMessage(msg); + + if (msg_obj) { + PyObject *ret = PyObject_CallFunctionObjArgs(handler, msg_obj, NULL); + + if (!ret) { + PyErr_Print(); + } + Py_CLEAR(ret); + Py_CLEAR(msg_obj); + } + /* else OOM has happened - not a lot we can do about that, + * except possibly making it fatal (FIXME?) */ + } + +release: + Py_CLEAR(handler); + PyGILState_Release(gil); +} + +PyDoc_STRVAR(PendingCall_get_completed__doc__, +"get_completed() -> bool\n\n" +"Return true if this pending call has completed.\n\n" +"If so, its associated reply handler has been called and it is no\n" +"longer meaningful to cancel it.\n"); +static PyObject * +PendingCall_get_completed(PendingCall *self, PyObject *unused UNUSED) +{ + dbus_bool_t ret; + + Py_BEGIN_ALLOW_THREADS + ret = dbus_pending_call_get_completed(self->pc); + Py_END_ALLOW_THREADS + return PyBool_FromLong(ret); +} + +/* Steals the reference to the pending call. */ +PyObject * +DBusPyPendingCall_ConsumeDBusPendingCall(DBusPendingCall *pc, + PyObject *callable) +{ + dbus_bool_t ret; + PyObject *list = PyList_New(1); + PendingCall *self = PyObject_New(PendingCall, &PendingCallType); + + if (!list || !self) { + Py_CLEAR(list); + Py_CLEAR(self); + Py_BEGIN_ALLOW_THREADS + dbus_pending_call_cancel(pc); + dbus_pending_call_unref(pc); + Py_END_ALLOW_THREADS + return NULL; + } + + /* INCREF because SET_ITEM steals a ref */ + Py_INCREF(callable); + PyList_SET_ITEM(list, 0, callable); + + /* INCREF so we can give a ref to set_notify and still have one */ + Py_INCREF(list); + + Py_BEGIN_ALLOW_THREADS + ret = dbus_pending_call_set_notify(pc, + (DBusPendingCallNotifyFunction)_pending_call_notify_function, + (void *)list, (DBusFreeFunction)dbus_py_take_gil_and_xdecref); + Py_END_ALLOW_THREADS + + if (!ret) { + PyErr_NoMemory(); + /* DECREF twice - one for the INCREF and one for the allocation */ + Py_DECREF(list); + Py_CLEAR(list); + Py_CLEAR(self); + Py_BEGIN_ALLOW_THREADS + dbus_pending_call_cancel(pc); + dbus_pending_call_unref(pc); + Py_END_ALLOW_THREADS + return NULL; + } + + /* As Alexander Larsson pointed out on dbus@lists.fd.o on 2006-11-30, + * the API has a race condition if set_notify runs in one thread and a + * mail loop runs in another - if the reply gets in before set_notify + * runs, the notify isn't called and there is no indication of error. + * + * The workaround is to check for completion immediately, but this also + * has a race which might lead to getting the notify called twice if + * we're unlucky. So I use the list to arrange for the notify to be + * deleted before it's called for the second time. The GIL protects + * the critical section in which I delete the callback from the list. + */ + if (dbus_pending_call_get_completed(pc)) { + /* the first race condition happened, so call the callable here. + * FIXME: we ought to arrange for the callable to run from the + * mainloop thread, like it would if the race hadn't happened... + * this needs a better mainloop abstraction, though. + */ + _pending_call_notify_function(pc, list); + } + + Py_CLEAR(list); + self->pc = pc; + return (PyObject *)self; +} + +static void +PendingCall_tp_dealloc (PendingCall *self) +{ + if (self->pc) { + Py_BEGIN_ALLOW_THREADS + dbus_pending_call_unref(self->pc); + Py_END_ALLOW_THREADS + } + PyObject_Del (self); +} + +static PyMethodDef PendingCall_tp_methods[] = { + {"block", (PyCFunction)PendingCall_block, METH_NOARGS, + PendingCall_block__doc__}, + {"cancel", (PyCFunction)PendingCall_cancel, METH_NOARGS, + PendingCall_cancel__doc__}, + {"get_completed", (PyCFunction)PendingCall_get_completed, METH_NOARGS, + PendingCall_get_completed__doc__}, + {NULL, NULL, 0, NULL} +}; + +static PyTypeObject PendingCallType = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.lowlevel.PendingCall", + sizeof(PendingCall), + 0, + (destructor)PendingCall_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + PendingCall_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + PendingCall_tp_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + /* deliberately not callable! Use PendingCall_ConsumeDBusPendingCall */ + 0, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_pending_call (void) +{ + if (PyType_Ready (&PendingCallType) < 0) return 0; + return 1; +} + +dbus_bool_t +dbus_py_insert_pending_call (PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF (&PendingCallType); + if (PyModule_AddObject (this_module, "PendingCall", + (PyObject *)&PendingCallType) < 0) return 0; + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/server.c b/_dbus_bindings/server.c new file mode 100644 index 0000000..07652c4 --- /dev/null +++ b/_dbus_bindings/server.c @@ -0,0 +1,613 @@ +/* Implementation of the _dbus_bindings Server type, a Python wrapper + * for DBusServer. + * + * Copyright (C) 2008 Openismus GmbH + * Copyright (C) 2008 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +/* Server definition ================================================ */ + +typedef struct { + PyObject_HEAD + DBusServer *server; + + /* The Connection subtype for which this Server is a factory */ + PyObject *conn_class; + + /* Weak-references list to make server weakly referenceable */ + PyObject *weaklist; + + PyObject *mainloop; +} Server; + +PyDoc_STRVAR(Server_tp_doc, +"A D-Bus server.\n" +"\n" +"::\n" +"\n" +" Server(address, connection_subtype, mainloop=None, auth_mechanisms=None)\n" +" -> Server\n" +); + +/* D-Bus Server user data slot, containing an owned reference to either + * the Server, or a weakref to the Server. + */ +static dbus_int32_t _server_python_slot; + +/* C API for main-loop hooks ======================================== */ + +/* Return a borrowed reference to the DBusServer which underlies this + * Server. */ +DBusServer * +DBusPyServer_BorrowDBusServer(PyObject *self) +{ + DBusServer *dbs; + + TRACE(self); + if (!DBusPyServer_Check(self)) { + PyErr_SetString(PyExc_TypeError, "A dbus.server.Server is required"); + return NULL; + } + dbs = ((Server *)self)->server; + if (!dbs) { + PyErr_SetString(PyExc_RuntimeError, "Server is in an invalid " + "state: no DBusServer"); + return NULL; + } + return dbs; +} + +/* Internal C API =================================================== */ + +static dbus_bool_t +DBusPyServer_set_auth_mechanisms(Server *self, + PyObject *auth_mechanisms) +{ + PyObject *fast_seq = NULL, *references = NULL; + Py_ssize_t length; + Py_ssize_t i; + /* a mutable array of constant strings */ + const char **list = NULL; + dbus_bool_t ret = FALSE; + + fast_seq = PySequence_Fast(auth_mechanisms, + "Expecting sequence for auth_mechanisms parameter"); + + if (!fast_seq) + return FALSE; + + length = PySequence_Fast_GET_SIZE(fast_seq); + + list = calloc (length + 1, sizeof (char *)); + + if (!list) { + PyErr_NoMemory(); + goto finally; + } + + if (!(references = PyTuple_New(length))) + goto finally; + + for (i = 0; i < length; ++i) { + PyObject *am, *am_as_bytes; + + am = PySequence_Fast_GET_ITEM(auth_mechanisms, i); + if (!am) + goto finally; + + if (PyUnicode_Check(am)) { + am_as_bytes = PyUnicode_AsUTF8String(am); + if (!am_as_bytes) + goto finally; + } + else { + am_as_bytes = am; + Py_INCREF(am_as_bytes); + } + list[i] = PyBytes_AsString(am_as_bytes); + if (!list[i]) + goto finally; + + PyTuple_SET_ITEM(references, i, am_as_bytes); + } + + list[length] = NULL; + + Py_BEGIN_ALLOW_THREADS + dbus_server_set_auth_mechanisms(self->server, list); + Py_END_ALLOW_THREADS + + ret = TRUE; + +finally: + if (list) + free (list); + Py_CLEAR(fast_seq); + Py_CLEAR(references); + return ret; +} + +/* Return a new reference to a Python Server or subclass corresponding + * to the DBusServer server. For use in callbacks. + * + * Raises AssertionError if the DBusServer does not have a Server. + */ +static PyObject * +DBusPyServer_ExistingFromDBusServer(DBusServer *server) +{ + PyObject *self, *ref; + + Py_BEGIN_ALLOW_THREADS + ref = (PyObject *)dbus_server_get_data(server, + _server_python_slot); + Py_END_ALLOW_THREADS + if (ref) { + DBG("(DBusServer *)%p has weak reference at %p", server, ref); + self = PyWeakref_GetObject(ref); /* still a borrowed ref */ + if (self && self != Py_None && DBusPyServer_Check(self)) { + DBG("(DBusServer *)%p has weak reference at %p pointing to %p", + server, ref, self); + TRACE(self); + Py_INCREF(self); + TRACE(self); + return self; + } + } + + PyErr_SetString(PyExc_AssertionError, + "D-Bus server does not have a Server " + "instance associated with it"); + return NULL; +} + +static void +DBusPyServer_new_connection_cb(DBusServer *server, + DBusConnection *conn, + void *data UNUSED) +{ + PyGILState_STATE gil = PyGILState_Ensure(); + PyObject *self = NULL; + PyObject *method = NULL; + + self = DBusPyServer_ExistingFromDBusServer(server); + if (!self) goto out; + TRACE(self); + + method = PyObject_GetAttrString(self, "_on_new_connection"); + TRACE(method); + + if (method) { + PyObject *conn_class = ((Server *)self)->conn_class; + PyObject *wrapper = DBusPyLibDBusConnection_New(conn); + PyObject *conn_obj; + PyObject *result; + + if (!wrapper) + goto out; + + conn_obj = PyObject_CallFunctionObjArgs((PyObject *)conn_class, + wrapper, ((Server*) self)->mainloop, NULL); + Py_CLEAR(wrapper); + + if (!conn_obj) + goto out; + + result = PyObject_CallFunctionObjArgs(method, conn_obj, NULL); + Py_CLEAR (conn_obj); + + /* discard result if not NULL, and fall through regardless */ + Py_CLEAR(result); + } + +out: + Py_CLEAR(method); + Py_CLEAR(self); + + if (PyErr_Occurred()) + PyErr_Print(); + + PyGILState_Release(gil); +} + +/* Return a new reference to a Python Server or subclass (given by cls) + * corresponding to the DBusServer server, which must have been newly + * created. For use by the Server constructor. + * + * Raises AssertionError if the DBusServer already has a Server. + * + * One reference to server is stolen - either the returned DBusPyServer + * claims it, or it's unreffed. + */ +static PyObject * +DBusPyServer_NewConsumingDBusServer(PyTypeObject *cls, + DBusServer *server, + PyObject *conn_class, + PyObject *mainloop, + PyObject *auth_mechanisms) +{ + Server *self = NULL; + PyObject *ref; + dbus_bool_t ok; + + DBG("%s(cls=%p, server=%p, mainloop=%p, auth_mechanisms=%p)", + __func__, cls, server, mainloop, auth_mechanisms); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(server); + + Py_BEGIN_ALLOW_THREADS + ref = (PyObject *)dbus_server_get_data(server, + _server_python_slot); + Py_END_ALLOW_THREADS + if (ref) { + self = (Server *)PyWeakref_GetObject(ref); + ref = NULL; + if (self && (PyObject *)self != Py_None) { + self = NULL; + PyErr_SetString(PyExc_AssertionError, + "Newly created D-Bus server already has a " + "Server instance associated with it"); + DBG("%s() fail - assertion failed, DBusPyServer has a DBusServer already", __func__); + DBG_WHEREAMI; + return NULL; + } + } + ref = NULL; + + /* Change mainloop from a borrowed reference to an owned reference */ + if (!mainloop || mainloop == Py_None) { + mainloop = dbus_py_get_default_main_loop(); + + if (!mainloop || mainloop == Py_None) { + PyErr_SetString(PyExc_RuntimeError, + "To run a D-Bus server, you need to either " + "pass mainloop=... to the constructor or call " + "dbus.set_default_main_loop(...)"); + goto err; + } + } + else { + Py_INCREF(mainloop); + } + + DBG("Constructing Server from DBusServer at %p", server); + + self = (Server *)(cls->tp_alloc(cls, 0)); + if (!self) goto err; + TRACE(self); + + DBG_WHEREAMI; + + self->server = NULL; + + Py_INCREF(conn_class); + self->conn_class = conn_class; + + self->mainloop = mainloop; + mainloop = NULL; /* don't DECREF it - the DBusServer owns it now */ + + ref = PyWeakref_NewRef((PyObject *)self, NULL); + if (!ref) goto err; + DBG("Created weak ref %p to (Server *)%p for (DBusServer *)%p", + ref, self, server); + + Py_BEGIN_ALLOW_THREADS + ok = dbus_server_set_data(server, _server_python_slot, + (void *)ref, + (DBusFreeFunction)dbus_py_take_gil_and_xdecref); + Py_END_ALLOW_THREADS + + if (ok) { + DBG("Attached weak ref %p ((Server *)%p) to (DBusServer *)%p", + ref, self, server); + + ref = NULL; /* don't DECREF it - the DBusServer owns it now */ + } + else { + DBG("Failed to attached weak ref %p ((Server *)%p) to " + "(DBusServer *)%p - will dispose of it", ref, self, server); + PyErr_NoMemory(); + goto err; + } + + DBUS_PY_RAISE_VIA_GOTO_IF_FAIL(server, err); + self->server = server; + /* the DBusPyServer will close it now */ + server = NULL; + + if (self->mainloop != Py_None && + !dbus_py_set_up_server((PyObject *)self, self->mainloop)) + goto err; + + if (auth_mechanisms && auth_mechanisms != Py_None && + !DBusPyServer_set_auth_mechanisms(self, auth_mechanisms)) + goto err; + + Py_BEGIN_ALLOW_THREADS + dbus_server_set_new_connection_function(self->server, + DBusPyServer_new_connection_cb, + NULL, NULL); + Py_END_ALLOW_THREADS + + DBG("%s() -> %p", __func__, self); + TRACE(self); + return (PyObject *)self; + +err: + DBG("Failed to construct Server from DBusServer at %p", server); + Py_CLEAR(mainloop); + Py_CLEAR(self); + Py_CLEAR(ref); + + if (server) { + Py_BEGIN_ALLOW_THREADS + dbus_server_disconnect(server); + dbus_server_unref(server); + Py_END_ALLOW_THREADS + } + + DBG("%s() fail", __func__); + DBG_WHEREAMI; + return NULL; +} + +/* Server type-methods ============================================== */ + +static PyObject * +Server_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + DBusServer *server; + const char *address; + DBusError error; + PyObject *self, *conn_class, *mainloop = NULL, *auth_mechanisms = NULL; + static char *argnames[] = { "address", "connection_class", "mainloop", + "auth_mechanisms", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|OO", argnames, + &address, &conn_class, &mainloop, &auth_mechanisms)) { + return NULL; + } + + if (!PyType_Check(conn_class) || + !PyType_IsSubtype((PyTypeObject *) conn_class, &DBusPyConnection_Type)) { + /* strictly speaking, it can be any subtype of + * _dbus_bindings._Connection - but nobody else should be subtyping + * that, so let's keep this slightly inaccurate message */ + PyErr_SetString(PyExc_TypeError, "connection_class must be " + "dbus.connection.Connection or a subtype"); + return NULL; + } + + dbus_error_init(&error); + + Py_BEGIN_ALLOW_THREADS + server = dbus_server_listen(address, &error); + Py_END_ALLOW_THREADS + + if (!server) { + DBusPyException_ConsumeError(&error); + return NULL; + } + + self = DBusPyServer_NewConsumingDBusServer(cls, server, conn_class, + mainloop, auth_mechanisms); + ((Server *)self)->weaklist = NULL; + TRACE(self); + + return self; +} + +/* Destructor */ +static void Server_tp_dealloc(Server *self) +{ + DBusServer *server = self->server; + PyObject *et, *ev, *etb; + + /* avoid clobbering any pending exception */ + PyErr_Fetch(&et, &ev, &etb); + + if (self->weaklist) { + PyObject_ClearWeakRefs((PyObject *)self); + } + + TRACE(self); + DBG("Deallocating Server at %p (DBusServer at %p)", self, server); + DBG_WHEREAMI; + + if (server) { + DBG("Server at %p has a server, disconnecting it...", self); + Py_BEGIN_ALLOW_THREADS + dbus_server_disconnect(server); + Py_END_ALLOW_THREADS + } + + Py_CLEAR(self->mainloop); + + /* make sure to do this last to preserve the invariant that + * self->server is always non-NULL for any referenced Server. + */ + DBG("Server at %p: nulling self->server", self); + self->server = NULL; + + if (server) { + DBG("Server at %p: unreffing server", self); + dbus_server_unref(server); + } + + DBG("Server at %p: freeing self", self); + PyErr_Restore(et, ev, etb); + (Py_TYPE(self)->tp_free)((PyObject *)self); +} + +PyDoc_STRVAR(Server_disconnect__doc__, +"disconnect()\n\n" +"Releases the server's address and stops listening for new clients.\n\n" +"If called more than once, only the first call has an effect."); +static PyObject * +Server_disconnect (Server *self, PyObject *args UNUSED) +{ + TRACE(self); + if (self->server) { + Py_BEGIN_ALLOW_THREADS + dbus_server_disconnect(self->server); + Py_END_ALLOW_THREADS + } + Py_RETURN_NONE; +} + +PyDoc_STRVAR(Server_get_address__doc__, +"get_address() -> str\n\n" +"Returns the address of the server."); +static PyObject * +Server_get_address(Server *self, PyObject *args UNUSED) +{ + const char *address; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->server); + Py_BEGIN_ALLOW_THREADS + address = dbus_server_get_address(self->server); + Py_END_ALLOW_THREADS + + return NATIVESTR_FROMSTR(address); +} + +PyDoc_STRVAR(Server_get_id__doc__, +"get_id() -> str\n\n" +"Returns the unique ID of the server."); +static PyObject * +Server_get_id(Server *self, PyObject *args UNUSED) +{ + const char *id; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->server); + Py_BEGIN_ALLOW_THREADS + id = dbus_server_get_id(self->server); + Py_END_ALLOW_THREADS + + return NATIVESTR_FROMSTR(id); +} + +PyDoc_STRVAR(Server_get_is_connected__doc__, +"get_is_connected() -> bool\n\n" +"Return true if this Server is still listening for new connections.\n"); +static PyObject * +Server_get_is_connected (Server *self, PyObject *args UNUSED) +{ + dbus_bool_t ret; + + TRACE(self); + DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->server); + Py_BEGIN_ALLOW_THREADS + ret = dbus_server_get_is_connected(self->server); + Py_END_ALLOW_THREADS + return PyBool_FromLong(ret); +} + +/* Server type object =============================================== */ + +struct PyMethodDef DBusPyServer_tp_methods[] = { +#define ENTRY(name, flags) {#name, (PyCFunction)Server_##name, flags, Server_##name##__doc__} + ENTRY(disconnect, METH_NOARGS), + ENTRY(get_address, METH_NOARGS), + ENTRY(get_id, METH_NOARGS), + ENTRY(get_is_connected, METH_NOARGS), + {NULL}, +#undef ENTRY +}; + +PyTypeObject DBusPyServer_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "_dbus_bindings._Server",/*tp_name*/ + sizeof(Server), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + /* methods */ + (destructor)Server_tp_dealloc, + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash*/ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ +#ifdef PY3 + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, +#else + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_WEAKREFS | Py_TPFLAGS_BASETYPE, +#endif + Server_tp_doc, /*tp_doc*/ + 0, /*tp_traverse*/ + 0, /*tp_clear*/ + 0, /*tp_richcompare*/ + offsetof(Server, weaklist), /*tp_weaklistoffset*/ + 0, /*tp_iter*/ + 0, /*tp_iternext*/ + DBusPyServer_tp_methods,/*tp_methods*/ + 0, /*tp_members*/ + 0, /*tp_getset*/ + 0, /*tp_base*/ + 0, /*tp_dict*/ + 0, /*tp_descr_get*/ + 0, /*tp_descr_set*/ + 0, /*tp_dictoffset*/ + 0, /*tp_init*/ + 0, /*tp_alloc*/ + Server_tp_new, /*tp_new*/ + 0, /*tp_free*/ + 0, /*tp_is_gc*/ +}; + +dbus_bool_t +dbus_py_init_server_types(void) +{ + /* Get a slot to store our weakref on DBus Server */ + _server_python_slot = -1; + if (!dbus_server_allocate_data_slot(&_server_python_slot)) + return FALSE; + + if (PyType_Ready(&DBusPyServer_Type) < 0) + return FALSE; + + return TRUE; +} + +dbus_bool_t +dbus_py_insert_server_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF (&DBusPyServer_Type); + if (PyModule_AddObject(this_module, "_Server", + (PyObject *)&DBusPyServer_Type) < 0) return FALSE; + + return TRUE; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/signature.c b/_dbus_bindings/signature.c new file mode 100644 index 0000000..e3a555c --- /dev/null +++ b/_dbus_bindings/signature.c @@ -0,0 +1,257 @@ +/* Implementation of Signature type for D-Bus bindings. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include +#include + +#include "types-internal.h" + +PyDoc_STRVAR(Signature_tp_doc, +"A string subclass whose values are restricted to valid D-Bus\n" +"signatures. When iterated over, instead of individual characters it\n" +"produces Signature instances representing single complete types.\n" +"\n" +"Constructor::\n" +"\n" +" ``Signature(value: str or unicode[, variant_level: int]) -> Signature``\n" +"\n" +"``value`` must be a valid D-Bus signature (zero or more single complete\n" +"types).\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a signature, this is represented in Python by a\n" +" Signature with variant_level==2.\n" +); + +typedef struct { + PyObject_HEAD + PyObject *bytes; + DBusSignatureIter iter; +} SignatureIter; + +static void +SignatureIter_tp_dealloc (SignatureIter *self) +{ + Py_CLEAR(self->bytes); + PyObject_Del(self); +} + +static PyObject * +SignatureIter_tp_iternext (SignatureIter *self) +{ + char *sig; + PyObject *obj; + + /* Stop immediately if finished or not correctly initialized */ + if (!self->bytes) return NULL; + + sig = dbus_signature_iter_get_signature(&(self->iter)); + if (!sig) return PyErr_NoMemory(); + obj = PyObject_CallFunction((PyObject *)&DBusPySignature_Type, "s", sig); + dbus_free(sig); + if (!obj) return NULL; + + if (!dbus_signature_iter_next(&(self->iter))) { + /* mark object as having been finished with */ + Py_CLEAR(self->bytes); + } + + return obj; +} + +static PyObject * +SignatureIter_tp_iter(PyObject *self) +{ + Py_INCREF(self); + return self; +} + +static PyTypeObject SignatureIterType = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "_dbus_bindings._SignatureIter", + sizeof(SignatureIter), + 0, + (destructor)SignatureIter_tp_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + SignatureIter_tp_iter, /* tp_iter */ + (iternextfunc)SignatureIter_tp_iternext, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + /* deliberately not callable! Use iter(Signature) instead */ + 0, /* tp_new */ + 0, /* tp_free */ +}; + +static PyObject * +Signature_tp_iter(PyObject *self) +{ + SignatureIter *iter = PyObject_New(SignatureIter, &SignatureIterType); + PyObject *self_as_bytes; + + if (!iter) return NULL; + +#ifdef PY3 + self_as_bytes = PyUnicode_AsUTF8String(self); + if (!self_as_bytes) { + Py_CLEAR(iter); + return NULL; + } +#else + self_as_bytes = self; + Py_INCREF(self_as_bytes); +#endif + + if (PyBytes_GET_SIZE(self_as_bytes) > 0) { + iter->bytes = self_as_bytes; + dbus_signature_iter_init(&(iter->iter), + PyBytes_AS_STRING(self_as_bytes)); + } + else { + /* this is a null string, make a null iterator */ + iter->bytes = NULL; + Py_CLEAR(self_as_bytes); + } + return (PyObject *)iter; +} + +static PyObject * +Signature_tp_new (PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + const char *str = NULL; + PyObject *ignored; + static char *argnames[] = {"object_path", "variant_level", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|O:__new__", argnames, + &str, &ignored)) return NULL; + if (!dbus_signature_validate(str, NULL)) { + PyErr_SetString(PyExc_ValueError, "Corrupt type signature"); + return NULL; + } + return (DBusPyStrBase_Type.tp_new)(cls, args, kwargs); +} + +PyTypeObject DBusPySignature_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.Signature", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + Signature_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + Signature_tp_iter, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPyStrBase_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + Signature_tp_new, /* tp_new */ + 0, /* tp_free */ +}; + +dbus_bool_t +dbus_py_init_signature(void) +{ + if (PyType_Ready(&SignatureIterType) < 0) return 0; + + DBusPySignature_Type.tp_base = &DBusPyStrBase_Type; + if (PyType_Ready(&DBusPySignature_Type) < 0) return 0; + DBusPySignature_Type.tp_print = NULL; + + return 1; +} + +dbus_bool_t +dbus_py_insert_signature(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF(&DBusPySignature_Type); + if (PyModule_AddObject(this_module, "Signature", + (PyObject *)&DBusPySignature_Type) < 0) return 0; + Py_INCREF(&SignatureIterType); + if (PyModule_AddObject(this_module, "_SignatureIter", + (PyObject *)&SignatureIterType) < 0) return 0; + + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/string.c b/_dbus_bindings/string.c new file mode 100644 index 0000000..8363f98 --- /dev/null +++ b/_dbus_bindings/string.c @@ -0,0 +1,383 @@ +/* Simple D-Bus types: ObjectPath and other string types. + * + * Copyright (C) 2006-2007 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include "types-internal.h" +#include + +#ifndef PY3 +/* UTF-8 string representation ====================================== */ + +PyDoc_STRVAR(UTF8String_tp_doc, +"A string represented using UTF-8 - a subtype of `str`.\n" +"\n" +"All strings on D-Bus are required to be valid Unicode; in the \"wire\n" +"protocol\" they're transported as UTF-8.\n" +"\n" +"By default, when byte arrays are converted from D-Bus to Python, they\n" +"come out as a `dbus.String`, which is a subtype of `unicode`.\n" +"If you prefer to get UTF-8 strings (as instances of this class) or you\n" +"want to avoid the conversion overhead of going from UTF-8 to Python's\n" +"internal Unicode representation, you can pass the ``utf8_strings=True``\n" +"keyword argument to any of these methods:\n" +"\n" +"* any D-Bus method proxy, or ``connect_to_signal``, on the objects returned\n" +" by `Bus.get_object`\n" +"* any D-Bus method on a `dbus.Interface`\n" +"* `dbus.Interface.connect_to_signal`\n" +"* `Bus.add_signal_receiver`\n" +"\n" +"\n" +"Constructor::\n" +"\n" +" dbus.UTF8String(value: str or unicode[, variant_level: int]) -> UTF8String\n" +"\n" +"If value is a str object it must be valid UTF-8.\n" +"\n" +"variant_level must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a string, this is represented in Python by a\n" +" String or UTF8String with variant_level==2.\n" +":Since: 0.80 (in older versions, use dbus.String)\n" +); + +static PyObject * +UTF8String_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + const char *str = NULL; + long variantness = 0; + static char *argnames[] = {"value", "variant_level", NULL}; + PyObject *unicode; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|l:__new__", argnames, + &str, &variantness)) return NULL; + unicode = PyUnicode_DecodeUTF8(str, strlen(str), NULL); + if (!unicode) return NULL; + Py_CLEAR(unicode); + return (DBusPyStrBase_Type.tp_new)(cls, args, kwargs); +} + +PyTypeObject DBusPyUTF8String_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.UTF8String", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + UTF8String_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPyStrBase_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + UTF8String_tp_new, /* tp_new */ +}; +#endif /* !PY3 */ + +/* Object path ====================================================== */ + +PyDoc_STRVAR(ObjectPath_tp_doc, +"A D-Bus object path, such as '/com/example/MyApp/Documents/abc'.\n" +"\n" +"ObjectPath is a subtype of str, and object-paths behave like strings.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.ObjectPath(path: str, variant_level: int) -> ObjectPath\n" +"\n" +"path must be an ASCII string following the syntax of object paths.\n" +"variant_level must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an object path, this is represented in Python by an\n" +" ObjectPath with variant_level==2.\n" +); + +static PyObject * +ObjectPath_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + const char *str = NULL; + long variantness = 0; + static char *argnames[] = {"object_path", "variant_level", NULL}; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|l:__new__", argnames, + &str, &variantness)) return NULL; + if (!dbus_py_validate_object_path(str)) { + return NULL; + } + return (DBusPyStrBase_Type.tp_new)(cls, args, kwargs); +} + +PyTypeObject DBusPyObjectPath_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.ObjectPath", + 0, + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + ObjectPath_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&DBusPyStrBase_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + ObjectPath_tp_new, /* tp_new */ +}; + +/* Unicode string representation ==================================== */ + +PyDoc_STRVAR(String_tp_doc, +"A string represented using Unicode - a subtype of `unicode`.\n" +"\n" +"All strings on D-Bus are required to be valid Unicode; in the \"wire\n" +"protocol\" they're transported as UTF-8.\n" +"\n" +"By default, when strings are converted from D-Bus to Python, they\n" +"come out as this class. If you prefer to get UTF-8 strings (as instances\n" +"of a subtype of `str`) or you want to avoid the conversion overhead of\n" +"going from UTF-8 to Python's internal Unicode representation, see the\n" +"documentation for `dbus.UTF8String`.\n" +"\n" +"Constructor::\n" +"\n" +" String(value: str or unicode[, variant_level: int]) -> String\n" +"\n" +"variant_level must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing a string, this is represented in Python by a\n" +" String or UTF8String with variant_level==2.\n" +); + +static PyMemberDef String_tp_members[] = { + {"variant_level", T_LONG, offsetof(DBusPyString, variant_level), + READONLY, + "The number of nested variants wrapping the real data. " + "0 if not in a variant"}, + {NULL}, +}; + +static PyObject * +String_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) +{ + PyObject *self; + long variantness = 0; + static char *argnames[] = {"variant_level", NULL}; + + if (PyTuple_Size(args) > 1) { + PyErr_SetString(PyExc_TypeError, + "__new__ takes at most one positional parameter"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(dbus_py_empty_tuple, kwargs, + "|l:__new__", argnames, + &variantness)) return NULL; + if (variantness < 0) { + PyErr_SetString(PyExc_ValueError, + "variant_level must be non-negative"); + return NULL; + } + self = (PyUnicode_Type.tp_new)(cls, args, NULL); + if (self) { + ((DBusPyString *)self)->variant_level = variantness; + } + return self; +} + +static PyObject * +String_tp_repr(PyObject *self) +{ + PyObject *parent_repr = (PyUnicode_Type.tp_repr)(self); + PyObject *my_repr; + + if (!parent_repr) { + return NULL; + } + if (((DBusPyString *)self)->variant_level > 0) { + my_repr = PyUnicode_FromFormat("%s(%V, variant_level=%ld)", + Py_TYPE(self)->tp_name, + REPRV(parent_repr), + ((DBusPyString *)self)->variant_level); + } + else { + my_repr = PyUnicode_FromFormat("%s(%V)", Py_TYPE(self)->tp_name, + REPRV(parent_repr)); + } + /* whether my_repr is NULL or not: */ + Py_CLEAR(parent_repr); + return my_repr; +} + +PyTypeObject DBusPyString_Type = { + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + "dbus.String", + sizeof(DBusPyString), + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + String_tp_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + dbus_py_immutable_setattro, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + String_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + String_tp_members, /* tp_members */ + 0, /* tp_getset */ + DEFERRED_ADDRESS(&PyUnicode_Type), /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + String_tp_new, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_string_types(void) +{ + /* don't need to do strange contortions for unicode, since it's not a + * "variable-size" object (it has a pointer to its data instead) + */ + if (PyUnicode_Type.tp_itemsize != 0) { + fprintf(stderr, "dbus-python is not compatible with this version of " + "Python (unicode objects are assumed to be fixed-size)"); + return 0; + } + DBusPyString_Type.tp_base = &PyUnicode_Type; + if (PyType_Ready(&DBusPyString_Type) < 0) return 0; + DBusPyString_Type.tp_print = NULL; + +#ifndef PY3 + DBusPyUTF8String_Type.tp_base = &DBusPyStrBase_Type; + if (PyType_Ready(&DBusPyUTF8String_Type) < 0) return 0; + DBusPyUTF8String_Type.tp_print = NULL; +#endif + + DBusPyObjectPath_Type.tp_base = &DBusPyStrBase_Type; + if (PyType_Ready(&DBusPyObjectPath_Type) < 0) return 0; + DBusPyObjectPath_Type.tp_print = NULL; + + return 1; +} + +dbus_bool_t +dbus_py_insert_string_types(PyObject *this_module) +{ + /* PyModule_AddObject steals a ref */ + Py_INCREF(&DBusPyObjectPath_Type); + Py_INCREF(&DBusPyString_Type); + if (PyModule_AddObject(this_module, "ObjectPath", + (PyObject *)&DBusPyObjectPath_Type) < 0) return 0; + if (PyModule_AddObject(this_module, "String", + (PyObject *)&DBusPyString_Type) < 0) return 0; + +#ifndef PY3 + Py_INCREF(&DBusPyUTF8String_Type); + if (PyModule_AddObject(this_module, "UTF8String", + (PyObject *)&DBusPyUTF8String_Type) < 0) return 0; +#endif + + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/types-internal.h b/_dbus_bindings/types-internal.h new file mode 100644 index 0000000..041c33b --- /dev/null +++ b/_dbus_bindings/types-internal.h @@ -0,0 +1,112 @@ +/* D-Bus types: implementation internals + * + * Copyright (C) 2006-2007 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include + +/* In Python2 >= 2.6 this aliases PyString to PyBytes. There is no PyString + * in Python 3, so this allows the C extension to be compilable in both Python + * versions. + */ +#include + +/* In Python 2.x, we need this to define the type of PyLongObject */ +#ifndef PY3 +#include +#endif + +#ifndef DBUS_BINDINGS_TYPES_INTERNAL_H +#define DBUS_BINDINGS_TYPES_INTERNAL_H + +#ifndef PY3 +extern PyTypeObject DBusPyIntBase_Type; +DEFINE_CHECK(DBusPyIntBase) + +typedef struct { + PyIntObject base; + long variant_level; +} DBusPyIntBase; +#endif + +extern PyTypeObject DBusPyLongBase_Type; +DEFINE_CHECK(DBusPyLongBase) + +extern PyTypeObject DBusPyFloatBase_Type; +DEFINE_CHECK(DBusPyFloatBase) + +typedef struct { + PyFloatObject base; + long variant_level; +} DBusPyFloatBase; + +typedef struct { + PyUnicodeObject unicode; + long variant_level; +} DBusPyString; + +extern PyTypeObject DBusPyStrBase_Type; +DEFINE_CHECK(DBusPyStrBase) + +#ifdef PY3 +extern PyTypeObject DBusPyBytesBase_Type; +DEFINE_CHECK(DBusPyBytesBase) +#endif + +dbus_int16_t dbus_py_int16_range_check(PyObject *); +dbus_uint16_t dbus_py_uint16_range_check(PyObject *); +dbus_int32_t dbus_py_int32_range_check(PyObject *); +dbus_uint32_t dbus_py_uint32_range_check(PyObject *); + +#if defined(DBUS_HAVE_INT64) && defined(HAVE_LONG_LONG) +# define DBUS_PYTHON_64_BIT_WORKS 1 +dbus_int64_t dbus_py_int64_range_check(PyObject *); +dbus_uint64_t dbus_py_uint64_range_check(PyObject *); +#else +# undef DBUS_PYTHON_64_BIT_WORKS +#endif /* defined(DBUS_HAVE_INT64) && defined(HAVE_LONG_LONG) */ + +extern PyObject *dbus_py_variant_level_const; +extern PyObject *dbus_py_signature_const; +extern PyObject *dbus_py__dbus_object_path__const; + +typedef struct { + PyListObject super; + PyObject *signature; + long variant_level; +} DBusPyArray; + +typedef struct { + PyDictObject super; + PyObject *signature; + long variant_level; +} DBusPyDict; + +PyObject *dbus_py_variant_level_getattro(PyObject *obj, PyObject *name); +dbus_bool_t dbus_py_variant_level_set(PyObject *obj, long variant_level); +void dbus_py_variant_level_clear(PyObject *obj); +long dbus_py_variant_level_get(PyObject *obj); + +#endif diff --git a/_dbus_bindings/unixfd.c b/_dbus_bindings/unixfd.c new file mode 100644 index 0000000..648dd2c --- /dev/null +++ b/_dbus_bindings/unixfd.c @@ -0,0 +1,254 @@ +/* Simple D-Bus types: Unix FD type. + * + * Copyright (C) 2006 Collabora Ltd. + * Copyright (C) 2010 Signove + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +#include "types-internal.h" + +PyDoc_STRVAR(UnixFd_tp_doc, +"An Unix Fd.\n" +"\n" +"Constructor::\n" +"\n" +" dbus.UnixFd(value: int or file object[, variant_level: int]) -> UnixFd\n" +"\n" +"``value`` must be the integer value of a file descriptor, or an object that\n" +"implements the fileno() method. Otherwise, `ValueError` will be\n" +"raised.\n" +"\n" +"UnixFd keeps a dup() (duplicate) of the supplied file descriptor. The\n" +"caller remains responsible for closing the original fd.\n" +"\n" +"``variant_level`` must be non-negative; the default is 0.\n" +"\n" +":IVariables:\n" +" `variant_level` : int\n" +" Indicates how many nested Variant containers this object\n" +" is contained in: if a message's wire format has a variant containing a\n" +" variant containing an Unix Fd, this is represented in Python by an\n" +" Unix Fd with variant_level==2.\n" +); + +typedef struct { + PyObject_HEAD + int fd; +} UnixFdObject; + +/* Return values: + * -2 - the long value overflows an int + * -1 - Python failed producing a long (or in Python 2 an int) + * 0 - success + * 1 - arg is not a long (or in Python 2 an int) + * + * Or to summarize: + * status < 0 - an error occurred, and a Python exception is set. + * status == 0 - all is okay, output argument *fd is set. + * status > 0 - try something else + */ +static int +make_fd(PyObject *arg, int *fd) +{ + long fd_arg; + + if (INTORLONG_CHECK(arg)) + { + /* on Python 2 this accepts either int or long */ + fd_arg = PyLong_AsLong(arg); + if (fd_arg == -1 && PyErr_Occurred()) { + return -1; + } + } + else { + return 1; + } + /* Check for int overflow. */ + if (fd_arg < INT_MIN || fd_arg > INT_MAX) { + PyErr_Format(PyExc_ValueError, "int is outside fd range"); + return -2; + } + *fd = (int)fd_arg; + return 0; +} + +static PyObject * +UnixFd_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs UNUSED) +{ + UnixFdObject *self = NULL; + PyObject *arg; + int status, fd, fd_original = -1; + + if (!PyArg_ParseTuple(args, "O", &arg, NULL)) { + return NULL; + } + + status = make_fd(arg, &fd_original); + if (status < 0) + return NULL; + + if (status > 0) { + if (PyObject_HasAttrString(arg, "fileno")) { + PyObject *fd_number = PyObject_CallMethod(arg, "fileno", NULL); + if (!fd_number) + return NULL; + status = make_fd(fd_number, &fd_original); + Py_CLEAR(fd_number); + if (status < 0) + return NULL; + if (status > 0) { + PyErr_Format(PyExc_ValueError, "Argument's fileno() method " + "returned a non-int value"); + return NULL; + } + /* fd_original is all good. */ + } + else { + PyErr_Format(PyExc_ValueError, "Argument is not int and does not " + "implement fileno() method"); + return NULL; + } + } + assert(fd_original >= 0); + fd = dup(fd_original); + if (fd < 0) { + PyErr_Format(PyExc_ValueError, "Invalid file descriptor"); + return NULL; + } + + self = (UnixFdObject *) cls->tp_alloc(cls, 0); + if (!self) + return NULL; + + self->fd = fd; + return (PyObject *)self; +} + +static void +UnixFd_dealloc(UnixFdObject *self) +{ + if (self->fd >= 0) { + close(self->fd); + self->fd = -1; + } +} + +PyDoc_STRVAR(UnixFd_take__doc__, +"take() -> int\n" +"\n" +"This method returns the file descriptor owned by UnixFd object.\n" +"Note that, once this method is called, closing the file descriptor is\n" +"the caller's responsibility.\n" +"\n" +"This method may be called at most once; UnixFd 'forgets' the file\n" +"descriptor after it is taken.\n" +"\n" +":Raises ValueError: if this method has already been called\n" +); +static PyObject * +UnixFd_take(UnixFdObject *self) +{ + PyObject *fdnumber; + + if (self->fd < 0) { + PyErr_SetString(PyExc_ValueError, "File descriptor already taken"); + return NULL; + } + + fdnumber = Py_BuildValue("i", self->fd); + self->fd = -1; + + return fdnumber; +} + +int +dbus_py_unix_fd_get_fd(PyObject *self) +{ + return ((UnixFdObject *) self)->fd; +} + +static PyMethodDef UnixFd_methods[] = { + {"take", (PyCFunction) UnixFd_take, METH_NOARGS, UnixFd_take__doc__ }, + {NULL} +}; + +PyTypeObject DBusPyUnixFd_Type = { + PyVarObject_HEAD_INIT(NULL, 0) + "dbus.UnixFd", + sizeof(UnixFdObject), + 0, + (destructor) UnixFd_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + UnixFd_tp_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + UnixFd_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + UnixFd_tp_new, /* tp_new */ +}; + +dbus_bool_t +dbus_py_init_unixfd_type(void) +{ + if (PyType_Ready(&DBusPyUnixFd_Type) < 0) return 0; + + return 1; +} + +dbus_bool_t +dbus_py_insert_unixfd_type(PyObject *this_module) +{ + Py_INCREF(&DBusPyUnixFd_Type); + if (PyModule_AddObject(this_module, "UnixFd", + (PyObject *)&DBusPyUnixFd_Type) < 0) return 0; + return 1; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_bindings/validation.c b/_dbus_bindings/validation.c new file mode 100644 index 0000000..abec0a9 --- /dev/null +++ b/_dbus_bindings/validation.c @@ -0,0 +1,245 @@ +/* Implementation of various validation functions for use in dbus-python. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "dbus_bindings-internal.h" + +dbus_bool_t +dbus_py_validate_bus_name(const char *name, + dbus_bool_t may_be_unique, + dbus_bool_t may_be_not_unique) +{ + dbus_bool_t dot = FALSE; + dbus_bool_t unique; + char last; + const char *ptr; + + if (name[0] == '\0') { + PyErr_SetString(PyExc_ValueError, "Invalid bus name: " + "may not be empty"); + return FALSE; + } + unique = (name[0] == ':'); + if (unique && !may_be_unique) { + PyErr_Format(PyExc_ValueError, "Invalid well-known bus name '%s':" + "only unique names may start with ':'", name); + return FALSE; + } + if (!unique && !may_be_not_unique) { + PyErr_Format(PyExc_ValueError, "Invalid unique bus name '%s': " + "unique names must start with ':'", name); + return FALSE; + } + if (strlen(name) > 255) { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': " + "too long (> 255 characters)", name); + return FALSE; + } + last = '\0'; + for (ptr = name + (unique ? 1 : 0); *ptr; ptr++) { + if (*ptr == '.') { + dot = TRUE; + if (last == '.') { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': " + "contains substring '..'", name); + return FALSE; + } + else if (last == '\0') { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': " + "must not start with '.'", name); + return FALSE; + } + } + else if (*ptr >= '0' && *ptr <= '9') { + if (!unique) { + if (last == '.') { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': " + "a digit may not follow '.' except in a " + "unique name starting with ':'", name); + return FALSE; + } + else if (last == '\0') { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': " + "must not start with a digit", name); + return FALSE; + } + } + } + else if ((*ptr < 'a' || *ptr > 'z') && + (*ptr < 'A' || *ptr > 'Z') && *ptr != '_' && *ptr != '-') { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': " + "contains invalid character '%c'", name, *ptr); + return FALSE; + } + last = *ptr; + } + if (last == '.') { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': must " + "not end with '.'", name); + return FALSE; + } + if (!dot) { + PyErr_Format(PyExc_ValueError, "Invalid bus name '%s': must " + "contain '.'", name); + return FALSE; + } + return TRUE; +} + +dbus_bool_t +dbus_py_validate_member_name(const char *name) +{ + const char *ptr; + + if (name[0] == '\0') { + PyErr_SetString(PyExc_ValueError, "Invalid member name: may not " + "be empty"); + return FALSE; + } + if (strlen(name) > 255) { + PyErr_Format(PyExc_ValueError, "Invalid member name '%s': " + "too long (> 255 characters)", name); + return FALSE; + } + for (ptr = name; *ptr; ptr++) { + if (*ptr >= '0' && *ptr <= '9') { + if (ptr == name) { + PyErr_Format(PyExc_ValueError, "Invalid member name '%s': " + "must not start with a digit", name); + return FALSE; + } + } + else if ((*ptr < 'a' || *ptr > 'z') && + (*ptr < 'A' || *ptr > 'Z') && *ptr != '_') { + PyErr_Format(PyExc_ValueError, "Invalid member name '%s': " + "contains invalid character '%c'", name, *ptr); + return FALSE; + } + } + return TRUE; +} + +dbus_bool_t +dbus_py_validate_interface_name(const char *name) +{ + dbus_bool_t dot = FALSE; + char last; + const char *ptr; + + if (name[0] == '\0') { + PyErr_SetString(PyExc_ValueError, "Invalid interface or error name: " + "may not be empty"); + return FALSE; + } + if (strlen(name) > 255) { + PyErr_Format(PyExc_ValueError, "Invalid interface or error name '%s': " + "too long (> 255 characters)", name); + return FALSE; + } + last = '\0'; + for (ptr = name; *ptr; ptr++) { + if (*ptr == '.') { + dot = TRUE; + if (last == '.') { + PyErr_Format(PyExc_ValueError, "Invalid interface or " + "error name '%s': contains substring '..'", name); + return FALSE; + } + else if (last == '\0') { + PyErr_Format(PyExc_ValueError, "Invalid interface or error " + "name '%s': must not start with '.'", name); + return FALSE; + } + } + else if (*ptr >= '0' && *ptr <= '9') { + if (last == '.') { + PyErr_Format(PyExc_ValueError, "Invalid interface or error " + "name '%s': a digit may not follow '.'", name); + return FALSE; + } + else if (last == '\0') { + PyErr_Format(PyExc_ValueError, "Invalid interface or error " + "name '%s': must not start with a digit", name); + return FALSE; + } + } + else if ((*ptr < 'a' || *ptr > 'z') && + (*ptr < 'A' || *ptr > 'Z') && *ptr != '_') { + PyErr_Format(PyExc_ValueError, "Invalid interface or error " + "name '%s': contains invalid character '%c'", + name, *ptr); + return FALSE; + } + last = *ptr; + } + if (last == '.') { + PyErr_Format(PyExc_ValueError, "Invalid interface or error name " + "'%s': must not end with '.'", name); + return FALSE; + } + if (!dot) { + PyErr_Format(PyExc_ValueError, "Invalid interface or error name " + "'%s': must contain '.'", name); + return FALSE; + } + return TRUE; +} + + +dbus_bool_t +dbus_py_validate_object_path(const char *path) +{ + const char *ptr; + + if (path[0] != '/') { + PyErr_Format(PyExc_ValueError, "Invalid object path '%s': does not " + "start with '/'", path); + return FALSE; + } + if (path[1] == '\0') return TRUE; + for (ptr = path + 1; *ptr; ptr++) { + if (*ptr == '/') { + if (ptr[-1] == '/') { + PyErr_Format(PyExc_ValueError, "Invalid object path '%s': " + "contains substring '//'", path); + return FALSE; + } + } + else if ((*ptr < 'a' || *ptr > 'z') && + (*ptr < 'A' || *ptr > 'Z') && + (*ptr < '0' || *ptr > '9') && *ptr != '_') { + PyErr_Format(PyExc_ValueError, "Invalid object path '%s': " + "contains invalid character '%c'", path, *ptr); + return FALSE; + } + } + if (ptr[-1] == '/') { + PyErr_Format(PyExc_ValueError, "Invalid object path '%s': ends " + "with '/' and is not just '/'", path); + return FALSE; + } + return TRUE; +} + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/_dbus_glib_bindings/module.c b/_dbus_glib_bindings/module.c new file mode 100644 index 0000000..1da1ddb --- /dev/null +++ b/_dbus_glib_bindings/module.c @@ -0,0 +1,216 @@ +/* Glue code to attach the GObject main loop to D-Bus from within Python. + * + * Copyright (C) 2006 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include + +#ifdef PY3 +PyMODINIT_FUNC PyInit__dbus_glib_bindings(void); +#else +PyMODINIT_FUNC init_dbus_glib_bindings(void); +#endif + +#if defined(__GNUC__) +# if __GNUC__ >= 3 +# define UNUSED __attribute__((__unused__)) +# else +# define UNUSED /*nothing*/ +# endif +#else +# define UNUSED /*nothing*/ +#endif + +static dbus_bool_t +dbus_py_glib_set_up_conn(DBusConnection *conn, void *data) +{ + GMainContext *ctx = (GMainContext *)data; + Py_BEGIN_ALLOW_THREADS + dbus_connection_setup_with_g_main(conn, ctx); + Py_END_ALLOW_THREADS + return 1; +} + +static dbus_bool_t +dbus_py_glib_set_up_srv(DBusServer *srv, void *data) +{ + GMainContext *ctx = (GMainContext *)data; + Py_BEGIN_ALLOW_THREADS + dbus_server_setup_with_g_main(srv, ctx); + Py_END_ALLOW_THREADS + return 1; +} + +static void +dbus_py_glib_unref_mainctx(void *data) +{ + if (data) + g_main_context_unref((GMainContext *)data); +} + +/* Generate a dbus-python NativeMainLoop wrapper from a GLib main loop */ +static PyObject * +dbus_glib_native_mainloop(GMainContext *ctx) +{ + PyObject *loop = DBusPyNativeMainLoop_New4(dbus_py_glib_set_up_conn, + dbus_py_glib_set_up_srv, + dbus_py_glib_unref_mainctx, + ctx ? g_main_context_ref(ctx) + : NULL); + if (!loop && ctx) { + g_main_context_unref(ctx); + } + return loop; +} + +PyDoc_STRVAR(module_doc, ""); + +PyDoc_STRVAR(DBusGMainLoop__doc__, +"DBusGMainLoop([set_as_default=False]) -> NativeMainLoop\n" +"\n" +"Return a NativeMainLoop object which can be used to\n" +"represent the default GLib main context in dbus-python.\n" +"\n" +"If the keyword argument set_as_default is given and is true, set the new\n" +"main loop as the default for all new Connection or Bus instances.\n" +"\n" +"Non-default main contexts are not currently supported.\n"); +static PyObject * +DBusGMainLoop (PyObject *always_null UNUSED, PyObject *args, PyObject *kwargs) +{ + PyObject *mainloop, *function, *result; + int set_as_default = 0; + static char *argnames[] = {"set_as_default", NULL}; + + if (PyTuple_Size(args) != 0) { + PyErr_SetString(PyExc_TypeError, "DBusGMainLoop() takes no " + "positional arguments"); + return NULL; + } + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", argnames, + &set_as_default)) { + return NULL; + } + + mainloop = dbus_glib_native_mainloop(NULL); + if (mainloop && set_as_default) { + if (!_dbus_bindings_module) { + PyErr_SetString(PyExc_ImportError, "_dbus_bindings not imported"); + Py_CLEAR(mainloop); + return NULL; + } + function = PyObject_GetAttrString(_dbus_bindings_module, + "set_default_main_loop"); + if (!function) { + Py_CLEAR(mainloop); + return NULL; + } + result = PyObject_CallFunctionObjArgs(function, mainloop, NULL); + Py_CLEAR(function); + if (!result) { + Py_CLEAR(mainloop); + return NULL; + } + Py_CLEAR(result); + } + return mainloop; +} + +PyDoc_STRVAR(setup_with_g_main__doc__, +"setup_with_g_main(conn: dbus.Connection)\n" +"\n" +"Deprecated.\n"); +static PyObject * +setup_with_g_main (PyObject *always_null UNUSED, PyObject *args) +{ + DBusConnection *dbc; + PyObject *conn; + if (!PyArg_ParseTuple(args, "O:setup_with_g_main", &conn)) return NULL; + + dbc = DBusPyConnection_BorrowDBusConnection (conn); + if (!dbc) return NULL; + dbus_py_glib_set_up_conn(dbc, NULL); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(gthreads_init__doc__, +"gthreads_init()"); +static PyObject * +gthreads_init (PyObject *always_null UNUSED, PyObject *no_args UNUSED) +{ + dbus_g_thread_init(); + Py_RETURN_NONE; +} + +static PyMethodDef module_functions[] = { + {"setup_with_g_main", setup_with_g_main, METH_VARARGS, + setup_with_g_main__doc__}, + {"gthreads_init", gthreads_init, METH_NOARGS, gthreads_init__doc__}, + {"DBusGMainLoop", (PyCFunction)DBusGMainLoop, + METH_VARARGS|METH_KEYWORDS, DBusGMainLoop__doc__}, + {NULL, NULL, 0, NULL} +}; + +#ifdef PY3 +PyMODINIT_FUNC +PyInit__dbus_glib_bindings(void) +{ + PyObject *this_module; + + static struct PyModuleDef moduledef = { + PyModuleDef_HEAD_INIT, + "_dbus_glib_bindings", /* m_name */ + module_doc, /* m_doc */ + -1, /* m_size */ + module_functions, /* m_methods */ + NULL, /* m_reload */ + NULL, /* m_traverse */ + NULL, /* m_clear */ + NULL /* m_free */ + }; + + if (import_dbus_bindings("_dbus_glib_bindings") < 0) + return NULL; + + if (!(this_module = PyModule_Create(&moduledef))) { + return NULL; + } + return this_module; +} +#else +PyMODINIT_FUNC +init_dbus_glib_bindings(void) +{ + PyObject *this_module; + + if (import_dbus_bindings("_dbus_glib_bindings") < 0) return; + this_module = Py_InitModule3 ("_dbus_glib_bindings", module_functions, + module_doc); + if (!this_module) return; +} +#endif + +/* vim:set ft=c cino< sw=4 sts=4 et: */ diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..d373777 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,1444 @@ +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.15' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.15], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.15])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------------- +# Adds support for distributing Python modules and packages. To +# install modules, copy them to $(pythondir), using the python_PYTHON +# automake variable. To install a package with the same name as the +# automake package, install to $(pkgpythondir), or use the +# pkgpython_PYTHON automake variable. +# +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +# locations to install python extension modules (shared libraries). +# Another macro is required to find the appropriate flags to compile +# extension modules. +# +# If your package is configured with a different prefix to python, +# users will have to add the install directory to the PYTHONPATH +# environment variable, or create a .pth file (see the python +# documentation for details). +# +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +# cause an error if the version of python installed on the system +# doesn't meet the requirement. MINIMUM-VERSION should consist of +# numbers and dots only. +AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], +[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl + python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) + + AC_ARG_VAR([PYTHON], [the Python interpreter]) + + m4_if([$1],[],[ + dnl No version check is needed. + # Find any Python interpreter. + if test -z "$PYTHON"; then + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi + am_display_PYTHON=python + ], [ + dnl A version check is needed. + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + AC_CACHE_CHECK([for a Python interpreter with version >= $1], + [am_cv_pathless_PYTHON],[ + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do + test "$am_cv_pathless_PYTHON" = none && break + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) + done]) + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) + fi + am_display_PYTHON=$am_cv_pathless_PYTHON + fi + ]) + + if test "$PYTHON" = :; then + dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else + + dnl Query Python for its version number. Getting [:3] seems to be + dnl the best way to do this; it's what "site.py" does in the standard + dnl library. + + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + + dnl Use the values of $prefix and $exec_prefix for the corresponding + dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made + dnl distinct variables so they can be overridden if need be. However, + dnl general consensus is that you shouldn't need this ability. + + AC_SUBST([PYTHON_PREFIX], ['${prefix}']) + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + + dnl At times (like when building shared libraries) you may want + dnl to know which OS platform Python thinks this is. + + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" + + dnl Set up 4 directories: + + dnl pythondir -- where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. + AC_CACHE_CHECK([for $am_display_PYTHON script directory], + [am_cv_python_pythondir], + [if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + + dnl pyexecdir -- directory for installing python extension modules + dnl (shared libraries) + dnl Query distutils for this directory. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], + [if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi + +]) + + +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +AC_DEFUN([AM_PYTHON_CHECK_VERSION], + [prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +sys.exit(sys.hexversion < minverhex)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/am-check-python-headers.m4]) +m4_include([m4/ax_append_compile_flags.m4]) +m4_include([m4/ax_append_flag.m4]) +m4_include([m4/ax_append_link_flags.m4]) +m4_include([m4/ax_check_compile_flag.m4]) +m4_include([m4/ax_check_link_flag.m4]) +m4_include([m4/ax_compiler_flags.m4]) +m4_include([m4/ax_compiler_flags_cflags.m4]) +m4_include([m4/ax_compiler_flags_gir.m4]) +m4_include([m4/ax_compiler_flags_ldflags.m4]) +m4_include([m4/ax_generate_changelog.m4]) +m4_include([m4/ax_is_release.m4]) +m4_include([m4/ax_python_module.m4]) +m4_include([m4/ax_require_defined.m4]) +m4_include([m4/dbus-py-add-rst2htmlflag.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) +m4_include([m4/pkg.m4]) diff --git a/build-aux/compile b/build-aux/compile new file mode 100755 index 0000000..a85b723 --- /dev/null +++ b/build-aux/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/build-aux/config.guess b/build-aux/config.guess new file mode 100755 index 0000000..1659250 --- /dev/null +++ b/build-aux/config.guess @@ -0,0 +1,1441 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2015 Free Software Foundation, Inc. + +timestamp='2015-08-20' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches to . + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2015 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/build-aux/config.sub b/build-aux/config.sub new file mode 100755 index 0000000..1acc966 --- /dev/null +++ b/build-aux/config.sub @@ -0,0 +1,1813 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2015 Free Software Foundation, Inc. + +timestamp='2015-08-20' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2015 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/build-aux/depcomp b/build-aux/depcomp new file mode 100755 index 0000000..fc98710 --- /dev/null +++ b/build-aux/depcomp @@ -0,0 +1,791 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2013-05-30.07; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputting dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Avoid interferences from the environment. +gccflag= dashmflag= + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB