Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-dbus-python for
openSUSE:Factory checked in at 2021-07-28 19:19:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-dbus-python (Old)
and /work/SRC/openSUSE:Factory/.python-dbus-python.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dbus-python"
Wed Jul 28 19:19:27 2021 rev:11 rq:908517 version:1.2.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-dbus-python/python-dbus-python.changes
2021-06-16 20:33:34.538990631 +0200
+++
/work/SRC/openSUSE:Factory/.python-dbus-python.new.1899/python-dbus-python.changes
2021-07-28 19:19:29.283678967 +0200
@@ -1,0 +2,23 @@
+Tue Jul 27 06:30:09 UTC 2021 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 1.2.18:
+ * dbus-python will be built for python3
+ * Python 2 reached end-of-life on 2020-01-01. A future version of
+ dbus-python is likely to remove Python 2 support.
+ * Move from collections.Sequence to collections.abc.Sequence on
+ Python ??? 3.3, for Python 3.10 compatibility
+ * Avoid another deprecation warning for inspect.getargspec().
+ This is similar to the one fixed in 1.2.4, but for dbus.decorators.signal
+ rather than dbus.decorators.method. (dbus-python!8; Martin Stumpf)
+ * Fix an unlikely fd leak if memory allocation fails for UnixFd
+ * Fix memory and fd leak if UnixFd is given an invalid negative
+ variant_level
+ * Avoid more deprecation warnings
+ * Disable -Wdeclaration-after-statement. Python 3.9 relies on intermixed
+ declarations and statements in its headers, so we can no longer
+ enforce this. (Simon McVittie)
+ * Convert examples to Python 3 (Simon McVittie)
+ * Use the same Python executable for build and dist/distcheck by default
+ * CI fixes
+
+-------------------------------------------------------------------
Old:
----
dbus-python-1.2.16.tar.gz
dbus-python-1.2.16.tar.gz.asc
New:
----
dbus-python-1.2.18.tar.gz
dbus-python-1.2.18.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-dbus-python.spec ++++++
--- /var/tmp/diff_new_pack.Cwkho4/_old 2021-07-28 19:19:29.839678237 +0200
+++ /var/tmp/diff_new_pack.Cwkho4/_new 2021-07-28 19:19:29.843678232 +0200
@@ -20,7 +20,7 @@
# expand separate from Provides/Obsoletes tags, because these are later
duplicated by the python_subpackages macro
%define python_add_provides %{python_provides}
Name: python-dbus-python
-Version: 1.2.16
+Version: 1.2.18
Release: 0
Summary: Python bindings for D-Bus
License: MIT
++++++ dbus-python-1.2.16.tar.gz -> dbus-python-1.2.18.tar.gz ++++++
++++ 2279 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/.travis.yml new/dbus-python-1.2.18/.travis.yml
--- old/dbus-python-1.2.16/.travis.yml 2019-11-25 19:54:58.000000000 +0100
+++ new/dbus-python-1.2.18/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-# Copyright ?? 2016 Simon McVittie
-#
-# SPDX-License-Identifier: MIT
-#
-# 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: xenial
-language: python
-cache:
- pip: true
- directories:
- - $HOME/.ccache
-install:
- - test -z "$dbus_ci_system_python" || deactivate
- - ./tools/ci-install.sh
-python:
- - "3.6"
- - "3.6-dev"
- - "3.7-dev"
- - "3.8-dev"
- - "nightly"
-script:
- - PATH="/usr/lib/ccache:$PATH" ./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.5"
- env:
- dbus_ci_system_python=python3
- - python: "3.5"
- env:
- dbus_ci_system_python=python3-dbg
- - python: "3.7"
- env:
- ci_distro=debian ci_docker=debian:buster-slim ci_suite=buster
dbus_ci_system_python=python3
- - python: "3.7"
- env:
- ci_distro=debian ci_docker=debian:buster-slim ci_suite=buster
dbus_ci_system_python=python3-dbg
-
-# vim:set sw=2 sts=2 et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/.version new/dbus-python-1.2.18/.version
--- old/dbus-python-1.2.16/.version 2020-01-14 10:29:16.000000000 +0100
+++ new/dbus-python-1.2.18/.version 2021-07-20 11:46:39.000000000 +0200
@@ -1 +1 @@
-1.2.16
+1.2.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/CONTRIBUTING.md new/dbus-python-1.2.18/CONTRIBUTING.md
--- old/dbus-python-1.2.16/CONTRIBUTING.md 2019-09-12 11:28:38.000000000
+0200
+++ new/dbus-python-1.2.18/CONTRIBUTING.md 2021-07-19 16:45:24.000000000
+0200
@@ -165,7 +165,7 @@
#### Pre-release steps
-* Make sure CI (currently Travis-CI and Gitlab) is passing
+* Make sure CI (currently Gitlab-CI) is passing
* Update `NEWS` and the version number in `configure.ac`, and commit them
#### Building and uploading the release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/MANIFEST new/dbus-python-1.2.18/MANIFEST
--- old/dbus-python-1.2.16/MANIFEST 2020-01-14 10:29:16.000000000 +0100
+++ new/dbus-python-1.2.18/MANIFEST 2021-07-20 11:46:39.000000000 +0200
@@ -1,4 +1,3 @@
-.travis.yml
.version
AUTHORS
CONTRIBUTING.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/MANIFEST.in new/dbus-python-1.2.18/MANIFEST.in
--- old/dbus-python-1.2.16/MANIFEST.in 2020-01-14 10:29:16.000000000 +0100
+++ new/dbus-python-1.2.18/MANIFEST.in 2021-07-20 11:46:39.000000000 +0200
@@ -1,4 +1,3 @@
-include .travis.yml
include .version
include AUTHORS
include CONTRIBUTING.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/Makefile.am new/dbus-python-1.2.18/Makefile.am
--- old/dbus-python-1.2.16/Makefile.am 2020-01-11 12:45:18.000000000 +0100
+++ new/dbus-python-1.2.18/Makefile.am 2021-07-19 16:51:57.000000000 +0200
@@ -4,6 +4,8 @@
installed_test_testdir = ${installed_testdir}/test
installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME}
+AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON)
+
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = dbus-gmain .
@@ -11,7 +13,6 @@
test/test-service.log \
$(NULL)
EXTRA_DIST = \
- .travis.yml \
AUTHORS \
CONTRIBUTING.md \
COPYING \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/NEWS new/dbus-python-1.2.18/NEWS
--- old/dbus-python-1.2.16/NEWS 2020-01-14 10:15:23.000000000 +0100
+++ new/dbus-python-1.2.18/NEWS 2021-07-20 11:45:45.000000000 +0200
@@ -1,3 +1,62 @@
+dbus Python Bindings 1.2.18 (2021-07-20)
+========================================
+
+Build-time configuration changes:
+
+??? dbus-python will be built for python3 if neither PYTHON nor
+ PYTHON_VERSION is specified. Use a command like
+
+ ./configure PYTHON=$(command -v python2)
+
+ if installation for Python 2 (EOL 2020-01-01) is required.
+
+Dependencies:
+
+??? Python 2 reached end-of-life on 2020-01-01. A future version of
+ dbus-python is likely to remove Python 2 support.
+
+Fixes:
+
+??? Move from collections.Sequence to collections.abc.Sequence on
+ Python ??? 3.3, for Python 3.10 compatibility
+ (dbus-python#37; Simon McVittie)
+
+??? Avoid another deprecation warning for inspect.getargspec().
+ This is similar to the one fixed in 1.2.4, but for dbus.decorators.signal
+ rather than dbus.decorators.method. (dbus-python!8; Martin Stumpf)
+
+??? Fix an unlikely fd leak if memory allocation fails for UnixFd
+ (dbus-python!9, Red Hat #1938703; David King)
+
+??? Fix memory and fd leak if UnixFd is given an invalid negative
+ variant_level (Simon McVittie)
+
+??? Avoid more deprecation warnings:
+ - gi.repository.GObject.MainLoop etc. (now used via gi.repository.GLib)
+ - gi.repository.GLib.threads_init (no longer necessary at all)
+ (Simon McVittie)
+
+??? Disable -Wdeclaration-after-statement. Python 3.9 relies on intermixed
+ declarations and statements in its headers, so we can no longer
+ enforce this. (Simon McVittie)
+
+??? Convert examples to Python 3 (Simon McVittie)
+
+??? Use the same Python executable for build and dist/distcheck by default
+ (Simon McVittie)
+
+CI fixes:
+
+??? Stop installing tap.py for Python 2. The latest version only supports
+ Python 3. (Simon McVittie)
+
+??? Move from Python 3.8 on Debian unstable (no longer available) to
+ 3.9 on Debian 11 (Simon McVittie)
+
+??? Also test with Python 3.10 on Ubuntu 21.10 (Simon McVittie)
+
+??? Remove Travis-CI integration, only use Gitlab-CI (Simon McVittie)
+
dbus Python Bindings 1.2.16 (2020-01-14)
========================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/PKG-INFO new/dbus-python-1.2.18/PKG-INFO
--- old/dbus-python-1.2.16/PKG-INFO 2020-01-14 10:29:16.000000000 +0100
+++ new/dbus-python-1.2.18/PKG-INFO 2021-07-20 11:46:39.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: dbus-python
-Version: 1.2.16
+Version: 1.2.18
Summary: Python bindings for libdbus
Home-page: http://www.freedesktop.org/wiki/Software/DBusBindings/#python
Maintainer: The D-Bus maintainers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/build-aux/compile
new/dbus-python-1.2.18/build-aux/compile
--- old/dbus-python-1.2.16/build-aux/compile 2020-01-14 10:22:11.000000000
+0100
+++ new/dbus-python-1.2.18/build-aux/compile 2021-07-20 11:28:41.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/build-aux/missing
new/dbus-python-1.2.18/build-aux/missing
--- old/dbus-python-1.2.16/build-aux/missing 2020-01-14 10:22:11.000000000
+0100
+++ new/dbus-python-1.2.18/build-aux/missing 2021-07-20 11:28:41.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/build-aux/py-compile
new/dbus-python-1.2.18/build-aux/py-compile
--- old/dbus-python-1.2.16/build-aux/py-compile 2020-01-14 10:22:12.000000000
+0100
+++ new/dbus-python-1.2.18/build-aux/py-compile 2021-07-20 11:28:41.000000000
+0200
@@ -1,9 +1,9 @@
#!/bin/sh
# py-compile - Compile a Python program
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2020-02-19.23; # UTC
-# Copyright (C) 2000-2018 Free Software Foundation, Inc.
+# Copyright (C) 2000-2020 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
@@ -115,8 +115,27 @@
filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
fi
+python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
+if test -z "$python_major"; then
+ echo "$me: could not determine $PYTHON major version, guessing 3" >&2
+ python_major=3
+fi
+
+# The old way to import libraries was deprecated.
+if test "$python_major" -le 2; then
+ import_lib=imp
+ import_test="hasattr(imp, 'get_tag')"
+ import_call=imp.cache_from_source
+ import_arg2=', False' # needed in one call and not the other
+else
+ import_lib=importlib
+ import_test="hasattr(sys.implementation, 'cache_tag')"
+ import_call=importlib.util.cache_from_source
+ import_arg2=
+fi
+
$PYTHON -c "
-import sys, os, py_compile, imp
+import sys, os, py_compile, $import_lib
files = '''$files'''
@@ -129,15 +148,15 @@
continue
sys.stdout.write(file)
sys.stdout.flush()
- if hasattr(imp, 'get_tag'):
- py_compile.compile(filepath, imp.cache_from_source(filepath), path)
+ if $import_test:
+ py_compile.compile(filepath, $import_call(filepath), path)
else:
py_compile.compile(filepath, filepath + 'c', path)
sys.stdout.write('\n')" || exit $?
# this will fail for python < 1.5, but that doesn't matter ...
$PYTHON -O -c "
-import sys, os, py_compile, imp
+import sys, os, py_compile, $import_lib
# pypy does not use .pyo optimization
if hasattr(sys, 'pypy_translation_info'):
@@ -153,8 +172,8 @@
continue
sys.stdout.write(file)
sys.stdout.flush()
- if hasattr(imp, 'get_tag'):
- py_compile.compile(filepath, imp.cache_from_source(filepath, False),
path)
+ if $import_test:
+ py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
else:
py_compile.compile(filepath, filepath + 'o', path)
sys.stdout.write('\n')" 2>/dev/null || :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/build-aux/tap-driver.sh
new/dbus-python-1.2.18/build-aux/tap-driver.sh
--- old/dbus-python-1.2.16/build-aux/tap-driver.sh 2020-01-14
10:22:11.000000000 +0100
+++ new/dbus-python-1.2.18/build-aux/tap-driver.sh 2021-07-20
11:28:41.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 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
@@ -369,7 +369,7 @@
sub("^(not )?ok[ \t]*", "", line)
# If the result has an explicit number, get it and strip it; otherwise,
- # automatically assing the next progresive number to it.
+ # automatically assign the next test number to it.
if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
{
match(line, "^[0-9]+")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/build-aux/test-driver
new/dbus-python-1.2.18/build-aux/test-driver
--- old/dbus-python-1.2.16/build-aux/test-driver 2020-01-14
10:22:12.000000000 +0100
+++ new/dbus-python-1.2.18/build-aux/test-driver 2021-07-20
11:28:41.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 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
@@ -42,11 +42,13 @@
{
cat <<END
Usage:
- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
- [--expect-failure={yes|no}] [--color-tests={yes|no}]
- [--enable-hard-errors={yes|no}] [--]
+ test-driver --test-name NAME --log-file PATH --trs-file PATH
+ [--expect-failure {yes|no}] [--color-tests {yes|no}]
+ [--enable-hard-errors {yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
END
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/configure.ac new/dbus-python-1.2.18/configure.ac
--- old/dbus-python-1.2.16/configure.ac 2020-01-14 10:15:32.000000000 +0100
+++ new/dbus-python-1.2.18/configure.ac 2021-07-20 11:45:38.000000000 +0200
@@ -5,7 +5,7 @@
m4_define(dbus_python_major_version, 1)
m4_define(dbus_python_minor_version, 2)
dnl Micro version is odd for non-releases
-m4_define(dbus_python_micro_version, 16)
+m4_define(dbus_python_micro_version, 18)
AC_INIT([dbus-python],
dbus_python_major_version.dbus_python_minor_version.dbus_python_micro_version,
@@ -77,6 +77,7 @@
AS_IF([test -n "$PYTHON_INCLUDES"],
[PYTHON_CPPFLAGS="$PYTHON_CPPFLAGS $PYTHON_INCLUDES"])
+AS_IF([test -z "$PYTHON_VERSION" && test -z "$PYTHON"], [PYTHON_VERSION=3])
AX_PYTHON_DEVEL([>= '2.7'])
AM_PATH_PYTHON
@@ -132,6 +133,7 @@
dnl AX_COMPILER_FLAGS, and are not const-correct for strings
[ \
-Wdeprecated-declarations \
+ -Wno-declaration-after-statement \
-Wno-duplicated-branches \
-Wno-inline \
-Wno-redundant-decls \
@@ -141,6 +143,7 @@
dnl AX_COMPILER_FLAGS doesn't order the compiler flags correctly to be able
dnl to disable flags that it would normally enable
WARN_CFLAGS="$(echo "${WARN_CFLAGS}" | ${SED} \
+ -e s/-Wdeclaration-after-statement// \
-e s/-Wduplicated-branches// \
-e s/-Winline// \
-e s/-Wredundant-decls// \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/dbus/decorators.py
new/dbus-python-1.2.18/dbus/decorators.py
--- old/dbus-python-1.2.16/dbus/decorators.py 2019-09-12 11:03:47.000000000
+0200
+++ new/dbus-python-1.2.18/dbus/decorators.py 2020-11-23 11:42:41.000000000
+0100
@@ -327,7 +327,16 @@
location[0].send_message(message)
# end emit_signal
- args = inspect.getargspec(func)[0]
+ if hasattr(inspect, 'Signature'):
+ args = []
+
+ for arg in inspect.signature(func).parameters.values():
+ if arg.kind in (inspect.Parameter.POSITIONAL_ONLY,
+ inspect.Parameter.POSITIONAL_OR_KEYWORD):
+ args.append(arg.name)
+ else:
+ args = inspect.getargspec(func)[0]
+
args.pop(0)
for keyword in rel_path_keyword, path_keyword:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/dbus/service.py new/dbus-python-1.2.18/dbus/service.py
--- old/dbus-python-1.2.16/dbus/service.py 2019-09-12 11:07:11.000000000
+0200
+++ new/dbus-python-1.2.18/dbus/service.py 2020-01-14 16:28:55.000000000
+0100
@@ -32,7 +32,11 @@
import logging
import threading
import traceback
-from collections import Sequence
+try:
+ from collections.abc import Sequence
+except ImportError:
+ # Python 2 (and 3.x < 3.3, but we don't support those)
+ from collections import Sequence
import _dbus_bindings
from dbus import (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/dbus_bindings/unixfd.c
new/dbus-python-1.2.18/dbus_bindings/unixfd.c
--- old/dbus-python-1.2.16/dbus_bindings/unixfd.c 2019-09-12
11:06:43.000000000 +0200
+++ new/dbus-python-1.2.18/dbus_bindings/unixfd.c 2021-07-19
16:45:24.000000000 +0200
@@ -111,6 +111,11 @@
return NULL;
}
+ if (variant_level < 0) {
+ PyErr_Format(PyExc_ValueError, "variant_level cannot be less than 0");
+ return NULL;
+ }
+
status = make_fd(arg, &fd_original);
if (status < 0)
return NULL;
@@ -145,14 +150,12 @@
}
self = (UnixFdObject *) cls->tp_alloc(cls, 0);
- if (!self)
+ if (!self) {
+ close(fd);
return NULL;
+ }
self->fd = fd;
- if (variant_level < 0) {
- PyErr_Format(PyExc_ValueError, "variant_level cannot be less than 0");
- return NULL;
- }
self->variant_level = variant_level;
return (PyObject *)self;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/dbus_python.egg-info/PKG-INFO
new/dbus-python-1.2.18/dbus_python.egg-info/PKG-INFO
--- old/dbus-python-1.2.16/dbus_python.egg-info/PKG-INFO 2020-01-14
10:29:16.000000000 +0100
+++ new/dbus-python-1.2.18/dbus_python.egg-info/PKG-INFO 2021-07-20
11:46:39.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: dbus-python
-Version: 1.2.16
+Version: 1.2.18
Summary: Python bindings for libdbus
Home-page: http://www.freedesktop.org/wiki/Software/DBusBindings/#python
Maintainer: The D-Bus maintainers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/dbus_python.egg-info/SOURCES.txt
new/dbus-python-1.2.18/dbus_python.egg-info/SOURCES.txt
--- old/dbus-python-1.2.16/dbus_python.egg-info/SOURCES.txt 2020-01-14
10:29:16.000000000 +0100
+++ new/dbus-python-1.2.18/dbus_python.egg-info/SOURCES.txt 2021-07-20
11:46:39.000000000 +0200
@@ -1,4 +1,3 @@
-.travis.yml
.version
AUTHORS
CONTRIBUTING.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/example-async-client.py
new/dbus-python-1.2.18/examples/example-async-client.py
--- old/dbus-python-1.2.16/examples/example-async-client.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/example-async-client.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,9 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
usage = """Usage:
-python example-service.py &
-python example-async-client.py
-python example-client.py --exit-service
+python3 example-service.py &
+python3 example-async-client.py
+python3 example-client.py --exit-service
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -45,7 +47,7 @@
global hello_replied
hello_replied = True
- print str(r)
+ print("async client:", str(r))
if hello_replied and raise_replied:
loop.quit()
@@ -56,8 +58,8 @@
hello_replied = True
failed = True
- print "HelloWorld raised an exception! That's not meant to happen..."
- print "\t", str(e)
+ print("async client: HelloWorld raised an exception! That's not meant to
happen...")
+ print("\t", str(e))
if hello_replied and raise_replied:
loop.quit()
@@ -68,7 +70,7 @@
raise_replied = True
failed = True
- print "RaiseException returned normally! That's not meant to happen..."
+ print("async client: RaiseException returned normally! That's not meant to
happen...")
if hello_replied and raise_replied:
loop.quit()
@@ -77,8 +79,8 @@
global raise_replied
raise_replied = True
- print "RaiseException raised an exception as expected:"
- print "\t", str(e)
+ print("async client: RaiseException raised an exception as expected:")
+ print("\t", str(e))
if hello_replied and raise_replied:
loop.quit()
@@ -106,7 +108,7 @@
remote_object =
bus.get_object("com.example.SampleService","/SomeObject")
except dbus.DBusException:
traceback.print_exc()
- print usage
+ print(usage)
sys.exit(1)
# Make the method call after a short delay
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/example-client.py
new/dbus-python-1.2.18/examples/example-client.py
--- old/dbus-python-1.2.16/examples/example-client.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/example-client.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,9 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
usage = """Usage:
-python example-service.py &
-python example-client.py
-python example-client.py --exit-service
+python3 example-service.py &
+python3 example-client.py
+python3 example-client.py --exit-service
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -48,30 +50,30 @@
dbus_interface = "com.example.SampleInterface")
except dbus.DBusException:
print_exc()
- print usage
+ print(usage)
sys.exit(1)
- print (hello_reply_list)
+ print("client:", hello_reply_list)
# ... or create an Interface wrapper for the remote object
iface = dbus.Interface(remote_object, "com.example.SampleInterface")
hello_reply_tuple = iface.GetTuple()
- print hello_reply_tuple
+ print("client:", hello_reply_tuple)
hello_reply_dict = iface.GetDict()
- print hello_reply_dict
+ print("client:", hello_reply_dict)
# D-Bus exceptions are mapped to Python exceptions
try:
iface.RaiseException()
except dbus.DBusException as e:
- print str(e)
+ print("client:", str(e))
# introspection is automatically supported
- print
remote_object.Introspect(dbus_interface="org.freedesktop.DBus.Introspectable")
+ print("client:",
remote_object.Introspect(dbus_interface="org.freedesktop.DBus.Introspectable"))
if sys.argv[1:] == ['--exit-service']:
iface.Exit()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/example-service.py
new/dbus-python-1.2.18/examples/example-service.py
--- old/dbus-python-1.2.16/examples/example-service.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/example-service.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,10 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
usage = """Usage:
-python example-service.py &
-python example-client.py
-python example-async-client.py
-python example-client.py --exit-service
+python3 example-service.py &
+python3 example-client.py
+python3 example-async-client.py
+python3 example-client.py --exit-service
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -46,7 +48,7 @@
@dbus.service.method("com.example.SampleInterface",
in_signature='s', out_signature='as')
def HelloWorld(self, hello_message):
- print (str(hello_message))
+ print("service:", str(hello_message))
return ["Hello", " from example-service.py", "with unique name",
session_bus.get_unique_name()]
@@ -80,6 +82,6 @@
object = SomeObject(session_bus, '/SomeObject')
mainloop = GLib.MainLoop()
- print "Running example service."
- print usage
+ print("Running example service.")
+ print(usage)
mainloop.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/example-signal-emitter.py
new/dbus-python-1.2.18/examples/example-signal-emitter.py
--- old/dbus-python-1.2.16/examples/example-signal-emitter.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/example-signal-emitter.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,9 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
usage = """Usage:
-python example-signal-emitter.py &
-python example-signal-recipient.py
-python example-signal-recipient.py --exit-service
+python3 example-signal-emitter.py &
+python3 example-signal-recipient.py
+python3 example-signal-recipient.py --exit-service
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -66,6 +68,6 @@
object = TestObject(session_bus)
loop = GLib.MainLoop()
- print "Running example signal emitter service."
- print usage
+ print("Running example signal emitter service.")
+ print(usage)
loop.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/example-signal-recipient.py
new/dbus-python-1.2.18/examples/example-signal-recipient.py
--- old/dbus-python-1.2.16/examples/example-signal-recipient.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/example-signal-recipient.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,9 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
usage = """Usage:
-python example-signal-emitter.py &
-python example-signal-recipient.py
-python example-signal-recipient.py --exit-service
+python3 example-signal-emitter.py &
+python3 example-signal-recipient.py
+python3 example-signal-recipient.py --exit-service
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -40,10 +42,10 @@
import dbus.mainloop.glib
def handle_reply(msg):
- print msg
+ print("recipient:", msg)
def handle_error(e):
- print str(e)
+ print("recipient:", str(e))
def emit_signal():
#call the emitHelloSignal method
@@ -58,20 +60,20 @@
return False
def hello_signal_handler(hello_string):
- print ("Received signal (by connecting using remote object) and it says: "
+ print("recipient: Received signal (by connecting using remote object) and
it says: "
+ hello_string)
def catchall_signal_handler(*args, **kwargs):
- print ("Caught signal (in catchall handler) "
+ print("recipient: Caught signal (in catchall handler) "
+ kwargs['dbus_interface'] + "." + kwargs['member'])
for arg in args:
- print " " + str(arg)
+ print(" " + str(arg))
def catchall_hello_signals_handler(hello_string):
- print "Received a hello signal and it says " + hello_string
-
+ print("recipient: Received a hello signal and it says " + hello_string)
+
def catchall_testservice_interface_handler(hello_string, dbus_message):
- print "com.example.TestService interface says " + hello_string + " when it
sent signal " + dbus_message.get_member()
+ print("recipient: com.example.TestService interface says " + hello_string
+ " when it sent signal " + dbus_message.get_member())
if __name__ == '__main__':
@@ -84,7 +86,7 @@
object.connect_to_signal("HelloSignal", hello_signal_handler,
dbus_interface="com.example.TestService", arg0="Hello")
except dbus.DBusException:
traceback.print_exc()
- print usage
+ print(usage)
sys.exit(1)
#lets make a catchall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/gconf-proxy-client.py
new/dbus-python-1.2.18/examples/gconf-proxy-client.py
--- old/dbus-python-1.2.16/examples/gconf-proxy-client.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/gconf-proxy-client.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
# Client for gconf-proxy-service2.py.
@@ -36,4 +38,4 @@
value = gconf_key_object.getString()
-print ("Value of GConf key %s is %s" % (gconf_key, value))
+print("client: Value of GConf key %s is %s" % (gconf_key, value))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/gconf-proxy-service2.py
new/dbus-python-1.2.18/examples/gconf-proxy-service2.py
--- old/dbus-python-1.2.16/examples/gconf-proxy-service2.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/gconf-proxy-service2.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
# Example of implementing an entire subtree of objects using
# a FallbackObject.
@@ -37,7 +39,12 @@
import dbus.service
from gi.repository import GLib
-import gconf
+
+try:
+ import gconf
+except ImportError:
+ print('service: gconf not available, using mock implementation')
+ gconf = None
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -47,22 +54,37 @@
class GConfObject(dbus.service.FallbackObject):
def __init__(self):
dbus.service.FallbackObject.__init__(self, dbus.SessionBus(),
'/org/gnome/GConf')
- self.client = gconf.client_get_default()
+ if gconf is None:
+ self.client = None
+ else:
+ self.client = gconf.client_get_default()
@dbus.service.method("org.gnome.GConf", in_signature='',
out_signature='s', rel_path_keyword='object_path')
def getString(self, object_path):
+ if self.client is None:
+ return '<gconf not available>'
+
return self.client.get_string(object_path)
@dbus.service.method("org.gnome.GConf", in_signature='s',
out_signature='', rel_path_keyword='object_path')
def setString(self, value, object_path):
+ if self.client is None:
+ raise RuntimeError('gconf not available')
+
self.client.set_string(object_path, value)
@dbus.service.method("org.gnome.GConf", in_signature='',
out_signature='i', rel_path_keyword='object_path')
def getInt(self, object_path):
+ if self.client is None:
+ return 42
+
return self.client.get_int(object_path)
@dbus.service.method("org.gnome.GConf", in_signature='i',
out_signature='', rel_path_keyword='object_path')
def setInt(self, value, object_path):
+ if self.client is None:
+ raise RuntimeError('gconf not available')
+
self.client.set_int(object_path, value)
gconf_service = GConfObject()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/list-system-services.py
new/dbus-python-1.2.18/examples/list-system-services.py
--- old/dbus-python-1.2.16/examples/list-system-services.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/list-system-services.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,6 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
-"""Usage: python list-system-services.py [--session|--system]
+from __future__ import print_function
+
+"""Usage: python3 list-system-services.py [--session|--system]
List services on the system bus (default) or the session bus."""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -65,7 +67,7 @@
services = dbus_iface.ListNames()
services.sort()
for service in services:
- print service
+ print(service)
if __name__ == '__main__':
main(sys.argv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/unix-fd-client.py
new/dbus-python-1.2.18/examples/unix-fd-client.py
--- old/dbus-python-1.2.16/examples/unix-fd-client.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/unix-fd-client.py 2021-07-20
11:34:20.000000000 +0200
@@ -1,10 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
import time
usage = """Usage:
-python unix-fd-service.py <file name> &
-python unix-fd-client.py
+python3 unix-fd-service.py <file name> &
+python3 unix-fd-client.py
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -48,18 +50,18 @@
except dbus.DBusException:
print_exc()
- print usage
+ print(usage)
sys.exit(1)
iface = dbus.Interface(remote_object, "com.example.SampleInterface")
# UnixFd is an opaque object that takes care of received fd
fd_object = iface.GetFd()
- print fd_object
+ print("client: fd_object = %s" % fd_object)
# Once we take the fd number, we are in charge of closing it!
fd = fd_object.take()
- print fd
+ print("client: fd = %s" % fd)
# We want to encapsulate the integer fd into a Python file or socket object
f = os.fdopen(fd, "r")
@@ -72,7 +74,7 @@
# otherwise it 'leaks' (stays open until program exits).
f.seek(0)
- print f.read()
+ print("client: read from fd = %r" % f.read())
if __name__ == '__main__':
main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/examples/unix-fd-service.py
new/dbus-python-1.2.18/examples/unix-fd-service.py
--- old/dbus-python-1.2.16/examples/unix-fd-service.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/examples/unix-fd-service.py 2021-07-20
11:11:58.000000000 +0200
@@ -1,8 +1,10 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from __future__ import print_function
usage = """Usage:
-python unix-fd-service.py <file name> &
-python unix-fd-client.py
+python3 unix-fd-service.py <file name> &
+python3 unix-fd-client.py
"""
# Copyright (C) 2004-2006 Red Hat Inc. <http://www.redhat.com/>
@@ -49,20 +51,20 @@
self.counter = (self.counter + 1) % 3
if self.counter == 0:
- print "sending UnixFd(filelike)"
+ print("service: sending UnixFd(filelike)")
return dbus.types.UnixFd(f)
elif self.counter == 1:
- print "sending int"
+ print("service: sending int")
return f.fileno()
else:
- print "sending UnixFd(int)"
+ print("service: sending UnixFd(int)")
return dbus.types.UnixFd(f.fileno())
if len(sys.argv) < 2:
- print usage
+ print(usage)
sys.exit(1)
-f = file(sys.argv[1], "r")
+f = open(sys.argv[1], "r")
if __name__ == '__main__':
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -72,6 +74,6 @@
object = SomeObject(session_bus, '/SomeObject')
mainloop = GLib.MainLoop()
- print "Running fd service."
- print usage
+ print("Running fd service.")
+ print(usage)
mainloop.run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/m4/libtool.m4 new/dbus-python-1.2.18/m4/libtool.m4
--- old/dbus-python-1.2.16/m4/libtool.m4 2020-01-14 10:22:07.000000000
+0100
+++ new/dbus-python-1.2.18/m4/libtool.m4 2021-07-20 11:28:37.000000000
+0200
@@ -1041,8 +1041,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1071,11 +1071,11 @@
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
10.[[012]][[,.]]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined
${wl}suppress' ;;
- 10.*)
+ 10.*|11.*)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
@@ -1492,7 +1492,7 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/m4/pkg.m4 new/dbus-python-1.2.18/m4/pkg.m4
--- old/dbus-python-1.2.16/m4/pkg.m4 2019-09-12 11:45:28.000000000 +0200
+++ new/dbus-python-1.2.18/m4/pkg.m4 2021-07-19 16:48:00.000000000 +0200
@@ -1,6 +1,6 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
dnl Copyright ?? 2004 Scott James Remnant <sc...@netsplit.com>.
dnl Copyright ?? 2012-2015 Dan Nicholson <dbn.li...@gmail.com>
dnl
@@ -41,7 +41,7 @@
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but
]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -142,7 +142,7 @@
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -152,11 +152,11 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
- else
+ else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -173,7 +173,7 @@
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/cross-test-client.py
new/dbus-python-1.2.18/test/cross-test-client.py
--- old/dbus-python-1.2.16/test/cross-test-client.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/test/cross-test-client.py 2020-11-23
11:42:41.000000000 +0100
@@ -28,7 +28,7 @@
import logging
try:
- from gi.repository import GObject as gobject
+ from gi.repository import GLib
except ImportError:
raise SystemExit(77)
@@ -415,9 +415,9 @@
# the Java cross test's interpretation is that the client should be
# at /Test too
client = Client(dbus.SessionBus(), '/Test')
- gobject.idle_add(client.run_client)
+ GLib.idle_add(client.run_client)
- loop = gobject.MainLoop()
+ loop = GLib.MainLoop()
logger.info("running...")
loop.run()
logger.info("main loop exited.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/cross-test-server.py
new/dbus-python-1.2.18/test/cross-test-server.py
--- old/dbus-python-1.2.16/test/cross-test-server.py 2019-09-12
11:03:47.000000000 +0200
+++ new/dbus-python-1.2.18/test/cross-test-server.py 2020-11-23
11:42:41.000000000 +0100
@@ -28,7 +28,7 @@
import logging
try:
- from gi.repository import GObject as gobject
+ from gi.repository import GLib
except ImportError:
raise SystemExit(77)
@@ -283,9 +283,9 @@
assert isinstance(object, str)
logger.info('method/signal: client wants me to emit Triggered(%r) from
%r', parameter, object)
tested_things.add(INTERFACE_TESTS + '.Trigger')
- gobject.idle_add(lambda: self.emit_Triggered_from(conn, object,
- parameter,
- reply_cb))
+ GLib.idle_add(lambda: self.emit_Triggered_from(conn, object,
+ parameter,
+ reply_cb))
def emit_Triggered_from(self, conn, object, parameter, reply_cb):
assert isinstance(object, str)
@@ -307,7 +307,7 @@
if x not in tested_things:
print('%s untested' % x)
logger.info('will quit when idle')
- gobject.idle_add(self._exit_fn)
+ GLib.idle_add(self._exit_fn)
class Server(SingleTestsImpl, TestsImpl, SignalTestsImpl):
@@ -325,7 +325,7 @@
if __name__ == '__main__':
bus = SessionBus()
bus_name = BusName(CROSS_TEST_BUS_NAME, bus=bus)
- loop = gobject.MainLoop()
+ loop = GLib.MainLoop()
obj = Server(bus_name, CROSS_TEST_PATH, loop.quit)
objects[CROSS_TEST_PATH] = obj
kwargs = {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/test-client.py
new/dbus-python-1.2.18/test/test-client.py
--- old/dbus-python-1.2.16/test/test-client.py 2020-01-11 12:45:18.000000000
+0100
+++ new/dbus-python-1.2.18/test/test-client.py 2020-11-23 11:42:41.000000000
+0100
@@ -42,9 +42,9 @@
from dbus._compat import is_py2, is_py3
try:
- from gi.repository import GObject as gobject
+ from gi.repository import GLib
except ImportError:
- print('1..0 # SKIP cannot import GObject')
+ print('1..0 # SKIP cannot import GLib')
raise SystemExit(0)
logging.basicConfig()
@@ -203,7 +203,7 @@
def testNoReply(self):
failures = []
report = []
- main_loop = gobject.MainLoop()
+ main_loop = GLib.MainLoop()
unicode_type = (str if is_py3 else unicode)
def message_filter(conn, m):
@@ -256,7 +256,7 @@
print("\n********* Testing Async Calls ***********")
failures = []
- main_loop = gobject.MainLoop()
+ main_loop = GLib.MainLoop()
class async_check:
def __init__(self, test_controler, expected_result, do_exit,
**kwargs):
@@ -574,7 +574,7 @@
dbus.Bus(private=True).close()
def testTimeoutAsyncClient(self):
- loop = gobject.MainLoop()
+ loop = GLib.MainLoop()
passes = []
fails = []
def correctly_returned():
@@ -685,7 +685,6 @@
self.assertEqual(send_val, recv_val.object)
"""
if __name__ == '__main__':
- gobject.threads_init()
dbus.glib.init_threads()
dbus_test_utils.main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/test-p2p.py new/dbus-python-1.2.18/test/test-p2p.py
--- old/dbus-python-1.2.16/test/test-p2p.py 2020-01-11 12:45:18.000000000
+0100
+++ new/dbus-python-1.2.18/test/test-p2p.py 2020-11-23 11:42:41.000000000
+0100
@@ -40,9 +40,9 @@
from dbus._compat import is_py2
try:
- from gi.repository import GObject as gobject
+ from gi.repository import GLib
except ImportError:
- print('1..0 # SKIP cannot import GObject')
+ print('1..0 # SKIP cannot import GLib')
raise SystemExit(0)
logging.basicConfig()
@@ -123,7 +123,6 @@
if __name__ == '__main__':
- gobject.threads_init()
dbus.glib.init_threads()
dbus_test_utils.main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/test-service.py
new/dbus-python-1.2.18/test/test-service.py
--- old/dbus-python-1.2.16/test/test-service.py 2019-09-12 11:07:11.000000000
+0200
+++ new/dbus-python-1.2.18/test/test-service.py 2020-11-23 11:42:41.000000000
+0100
@@ -51,7 +51,7 @@
import random
from dbus.gi_service import ExportedGObject
-from gi.repository import GObject
+from gi.repository import GLib
from dbus._compat import is_py2, is_py3
@@ -295,8 +295,8 @@
def AsynchronousMethod(self, async_, fail, variant, return_cb, error_cb):
try:
if async_:
- GObject.timeout_add(500, self.AsynchronousMethod, False, fail,
- variant, return_cb, error_cb)
+ GLib.timeout_add(500, self.AsynchronousMethod, False, fail,
+ variant, return_cb, error_cb)
return
else:
if fail:
@@ -342,7 +342,7 @@
def return_from_async_wait():
return_cb()
return False
- GObject.timeout_add(500, return_from_async_wait)
+ GLib.timeout_add(500, return_from_async_wait)
@dbus.service.method(IFACE, in_signature='', out_signature='')
def RaiseValueError(self):
@@ -405,7 +405,7 @@
logger.info('making Fallback')
fallback_object = Fallback(session_bus)
logger.info('creating mainloop')
- loop = GObject.MainLoop()
+ loop = GLib.MainLoop()
logger.info('running')
loop.run()
logger.info('done')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/test-signals.py
new/dbus-python-1.2.18/test/test-signals.py
--- old/dbus-python-1.2.16/test/test-signals.py 2020-01-11 12:45:18.000000000
+0100
+++ new/dbus-python-1.2.18/test/test-signals.py 2020-11-23 11:42:41.000000000
+0100
@@ -38,9 +38,9 @@
import dbus_test_utils
try:
- from gi.repository import GObject as gobject
+ from gi.repository import GLib
except ImportError:
- print('1..0 # SKIP cannot import GObject')
+ print('1..0 # SKIP cannot import GLib')
raise SystemExit(0)
logging.basicConfig()
@@ -111,23 +111,23 @@
path_keyword='path')
logger.info('Waiting for signal...')
iface.EmitSignal('SignalOneString', 0)
- source_id = gobject.timeout_add(1000, _timeout_handler)
+ source_id = GLib.timeout_add(1000, _timeout_handler)
main_loop.run()
if not result:
raise AssertionError('Signal did not arrive within 1 second')
logger.debug('Removing match')
match.remove()
- gobject.source_remove(source_id)
+ GLib.source_remove(source_id)
if test_removal:
self.in_test = name + '+removed'
logger.info('Testing %s', name)
result = []
iface.EmitSignal('SignalOneString', 0)
- source_id = gobject.timeout_add(1000, _rm_timeout_handler)
+ source_id = GLib.timeout_add(1000, _rm_timeout_handler)
main_loop.run()
if result:
raise AssertionError('Signal should not have arrived, but did')
- gobject.source_remove(source_id)
+ GLib.source_remove(source_id)
def testFallback(self):
self.signal_test_impl(self.fallback_iface, 'Fallback')
@@ -160,8 +160,7 @@
self.signal_test_impl(self.iface_follow, 'RemovalAgain', True)
if __name__ == '__main__':
- main_loop = gobject.MainLoop()
- gobject.threads_init()
+ main_loop = GLib.MainLoop()
dbus.glib.init_threads()
logger.info('Starting unit test')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/dbus-python-1.2.16/test/test-standalone.py
new/dbus-python-1.2.18/test/test-standalone.py
--- old/dbus-python-1.2.16/test/test-standalone.py 2020-01-11
12:45:18.000000000 +0100
+++ new/dbus-python-1.2.18/test/test-standalone.py 2021-07-19
16:45:24.000000000 +0200
@@ -612,6 +612,9 @@
with self.assertRaises(TypeError):
types.UnixFd(plain_fd, variant_level='nope')
+
+ with self.assertRaises(ValueError):
+ types.UnixFd(plain_fd, variant_level=-1)
finally:
os.close(plain_fd)
