开源软件构建与测试

_service:tar_scm:dbus-python.spec Changed

@@ -2,8 +2,8 @@
 %global python3dir %{_builddir}/python3-%{name}-%{version}-%{release}
 
 Name:		dbus-python
-Version:	1.2.18
-Release:	3
+Version:	1.3.2
+Release:	1
 Summary:	original Python binding for dbus
 License:	MIT and (AFL-2.1 or GPL-2.0-or-later)
 URL:		http://www.freedesktop.org/wiki/Software/DBusBindings/
@@ -13,7 +13,7 @@
 Patch1: 	Fix-deprecation-warnings-due-to-invalid-escape-seque.patch
 
 BuildRequires: dbus-devel dbus-glib-devel glib2-devel
-BuildRequires: dbus-x11 python3-gobject
+BuildRequires: dbus-x11 python3-gobject python3-pip python3-wheel
 BuildRequires: autoconf-archive automake libtool
 
 %description
@@ -47,6 +47,7 @@
 %build
 autoreconf -vif
 
+export DBUS_PYTHON_USE_AUTOTOOLS=1
 install -d %{python3dir}
 cp -a . %{python3dir}
 mv %{python3dir} python3-build
@@ -58,6 +59,7 @@
 popd
 
 %install
+export DBUS_PYTHON_USE_AUTOTOOLS=1
 pushd python3-build
 %py3_install
 %make_install
@@ -78,10 +80,9 @@
 
 %files -n python3-dbus
 %license COPYING
-%{python3_sitearch}/_dbus_bindings.so
-%{python3_sitearch}/_dbus_glib_bindings.so
+%{python3_sitearch}/*.so
 %{python3_sitearch}/dbus/
-%{python3_sitearch}/dbus_python-%{version}-py%{python3_version}.egg-info
+%{python3_sitearch}/dbus_python*egg-info
 
 %files devel
 %{_includedir}/dbus-1.0/dbus/%{name}.h
@@ -91,6 +92,9 @@
 %doc NEWS ChangeLog README doc/API_CHANGES.txt doc/tutorial.txt
 
 %changelog
+* Mon Oct 17 2022 dillon chen <dillon.chen@gmail.com> - 1.3.2-1
+- update to 1.3.2
+
 * Mon Dec 06 2021 herengui <herengui@uniontech.com> - 1.2.18-3
 - Type:update
 - ID:NA

_service:tar_scm:0001-Move-python-modules-to-architecture-specific-directo.patch Changed

@@ -1,4 +1,4 @@
-From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001
+From 86741aa93aaaf388899d1fa0c25d0d67729b7a5c Mon Sep 17 00:00:00 2001
 From: leigh123linux <leigh123linux@googlemail.com>
 Date: Tue, 23 Feb 2016 07:32:08 +0000
 Subject: PATCH Move python modules to architecture-specific directory
@@ -7,14 +7,14 @@
 things people want to be multilib-compatible.  As is the Python
 modules conflict.
 ---
- Makefile.am | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ Makefile.am | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index fd480d4..0859994 100644
+index 8738d57..b6d30c0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -155,7 +155,8 @@ test_dbus_py_test_la_SOURCES = \
+@@ -176,7 +176,8 @@ test_dbus_py_test_la_SOURCES = \
  
  # === dbus package ===
  
@@ -24,29 +24,24 @@
      dbus/bus.py \
      dbus/connection.py \
      dbus/_compat.py \
-@@ -175,12 +176,12 @@ nobase_python_PYTHON = \
+@@ -195,7 +196,7 @@ nobase_python_PYTHON = \
+     dbus/service.py \
      dbus/types.py
  
- if !HAVE_PYTHON_3
--nobase_python_PYTHON += \
-+nobase_dbuspy_DATA += \
-     dbus/gobject_service.py \
-     $(NULL)
- endif
- 
 -check_py_sources = $(nobase_python_PYTHON)
 +check_py_sources = $(nobase_dbuspy_DATA)
  include $(top_srcdir)/tools/check-coding-style.mk
  
  # === Devel stuff ===
-@@ -416,7 +417,7 @@ uninstall-local: uninstall-local-sphinx
+@@ -434,7 +435,7 @@ uninstall-local-pycache:
  if ENABLE_DOCUMENTATION
- all: doc/_build/.stamp
+ all: doc/html/.stamp
  
--doc/_build/.stamp: $(nobase_python_PYTHON) \
-+doc/_build/.stamp: $(nobase_dbuspy_DATA) \
+-doc/html/.stamp: $(nobase_python_PYTHON) \
++doc/html/.stamp: $(nobase_dbuspy_DATA) \
  			_dbus_bindings.la \
  			_dbus_glib_bindings.la \
  			$(sphinx_sources) \
 -- 
-2.17.0
+2.37.3
+

_service Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz.asc Deleted

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain Deleted

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/COPYING Deleted

@@ -1,551 +0,0 @@
-The D-Bus GLib main loop bindings are licensed to you under your choice
-of the Academic Free License version 2.1, or the GNU General Public
-License version 2. Both licenses are included here.
-
-In SPDX terms, this is:
-
-SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
-
-------------------------------------------------------------------------
-
-The Academic Free License
-v. 2.1
-
-This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work:
-
-Licensed under the Academic Free License version 2.1
-
-1) Grant of Copyright License. Licensor hereby grants You a
-world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
-license to do the following:
-
-a) to reproduce the Original Work in copies;
-
-b) to prepare derivative works ("Derivative Works") based upon the Original Work;
-
-c) to distribute copies of the Original Work and Derivative Works to the public;
-
-d) to perform the Original Work publicly; and
-
-e) to display the Original Work publicly.
-
-2) Grant of Patent License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license, under
-patent claims owned or controlled by the Licensor that are embodied in
-the Original Work as furnished by the Licensor, to make, use, sell and
-offer for sale the Original Work and Derivative Works.
-
-3) Grant of Source Code License. The term "Source Code" means the
-preferred form of the Original Work for making modifications to it and
-all available documentation describing how to modify the Original
-Work. Licensor hereby agrees to provide a machine-readable copy of the
-Source Code of the Original Work along with each copy of the Original
-Work that Licensor distributes. Licensor reserves the right to satisfy
-this obligation by placing a machine-readable copy of the Source Code
-in an information repository reasonably calculated to permit
-inexpensive and convenient access by You for as long as Licensor
-continues to distribute the Original Work, and by publishing the
-address of that information repository in a notice immediately
-following the copyright notice that applies to the Original Work.
-
-4) Exclusions From License Grant. Neither the names of Licensor, nor
-the names of any contributors to the Original Work, nor any of their
-trademarks or service marks, may be used to endorse or promote
-products derived from this Original Work without express prior written
-permission of the Licensor. Nothing in this License shall be deemed to
-grant any rights to trademarks, copyrights, patents, trade secrets or
-any other intellectual property of Licensor except as expressly stated
-herein. No patent license is granted to make, use, sell or offer to
-sell embodiments of any patent claims other than the licensed claims
-defined in Section 2. No right is granted to the trademarks of
-Licensor even if such marks are included in the Original Work. Nothing
-in this License shall be interpreted to prohibit Licensor from
-licensing under different terms from this License any Original Work
-that Licensor otherwise would have a right to license.
-
-5) This section intentionally omitted.
-
-6) Attribution Rights. You must retain, in the Source Code of any
-Derivative Works that You create, all copyright, patent or trademark
-notices from the Source Code of the Original Work, as well as any
-notices of licensing and any descriptive text identified therein as an
-"Attribution Notice." You must cause the Source Code for any
-Derivative Works that You create to carry a prominent Attribution
-Notice reasonably calculated to inform recipients that You have
-modified the Original Work.
-
-7) Warranty of Provenance and Disclaimer of Warranty. Licensor
-warrants that the copyright in and to the Original Work and the patent
-rights granted herein by Licensor are owned by the Licensor or are
-sublicensed to You under the terms of this License with the permission
-of the contributor(s) of those copyrights and patent rights. Except as
-expressly stated in the immediately proceeding sentence, the Original
-Work is provided under this License on an "AS IS" BASIS and WITHOUT
-WARRANTY, either express or implied, including, without limitation,
-the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL
-WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential
-part of this License. No license to Original Work is granted hereunder
-except under this disclaimer.
-
-8) Limitation of Liability. Under no circumstances and under no legal
-theory, whether in tort (including negligence), contract, or
-otherwise, shall the Licensor be liable to any person for any direct,
-indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or the use of the
-Original Work including, without limitation, damages for loss of
-goodwill, work stoppage, computer failure or malfunction, or any and
-all other commercial damages or losses. This limitation of liability
-shall not apply to liability for death or personal injury resulting
-from Licensor's negligence to the extent applicable law prohibits such
-limitation. Some jurisdictions do not allow the exclusion or
-limitation of incidental or consequential damages, so this exclusion
-and limitation may not apply to You.
-
-9) Acceptance and Termination. If You distribute copies of the
-Original Work or a Derivative Work, You must make a reasonable effort
-under the circumstances to obtain the express assent of recipients to
-the terms of this License. Nothing else but this License (or another
-written agreement between Licensor and You) grants You permission to
-create Derivative Works based upon the Original Work or to exercise
-any of the rights granted in Section 1 herein, and any attempt to do
-so except under the terms of this License (or another written
-agreement between Licensor and You) is expressly prohibited by
-U.S. copyright law, the equivalent laws of other countries, and by
-international treaty. Therefore, by exercising any of the rights
-granted to You in Section 1 herein, You indicate Your acceptance of
-this License and all of its terms and conditions.
-
-10) Termination for Patent Action. This License shall terminate
-automatically and You may no longer exercise any of the rights granted
-to You by this License as of the date You commence an action,
-including a cross-claim or counterclaim, against Licensor or any
-licensee alleging that the Original Work infringes a patent. This
-termination provision shall not apply for an action alleging patent
-infringement by combinations of the Original Work with other software
-or hardware.
-
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating
-to this License may be brought only in the courts of a jurisdiction
-wherein the Licensor resides or in which Licensor conducts its primary
-business, and under the laws of that jurisdiction excluding its
-conflict-of-law provisions. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any use of the Original Work outside the scope of
-this License or after its termination shall be subject to the
-requirements and penalties of the U.S. Copyright Act, 17 U.S.C. Â§ 101
-et seq., the equivalent laws of other countries, and international
-treaty. This section shall survive the termination of this License.
-
-12) Attorneys Fees. In any action to enforce the terms of this License
-or seeking damages relating thereto, the prevailing party shall be
-entitled to recover its costs and expenses, including, without
-limitation, reasonable attorneys' fees and costs incurred in
-connection with such action, including any appeal of such action. This
-section shall survive the termination of this License.
-
-13) Miscellaneous. This License represents the complete agreement
-concerning the subject matter hereof. If any provision of this License
-is held to be unenforceable, such provision shall be reformed only to
-the extent necessary to make it enforceable.
-
-14) Definition of "You" in This License. "You" throughout this
-License, whether in upper or lower case, means an individual or a
-legal entity exercising rights under, and complying with all of the
-terms of, this License. For legal entities, "You" includes any entity
-that controls, is controlled by, or is under common control with
-you. For purposes of this definition, "control" means (i) the power,
-direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity.
-
-15) Right to Use. You may use the Original Work in all ways not
-otherwise restricted or conditioned by this License or by law, and
-Licensor promises not to interfere with or be responsible for such
-uses by You.
-
-This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights
-reserved. Permission is hereby granted to copy and distribute this
-license without modification. This license may not be modified without
-the express written permission of its copyright owner.
-
-
--- 
-END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential 
-differences between the Academic Free License (AFL) version 1.0 and other 
-open source licenses:
-
-The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache 
-licenses in many respects but it is intended to solve a few problems with 
-those licenses.
-    
-* The AFL is written so as to make it clear what software is being 
-licensed (by the inclusion of a statement following the copyright notice 
-in the software). This way, the license functions better than a template 
-license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software.
-    
-* The AFL contains a complete copyright grant to the software. The BSD 
-and Apache licenses are vague and incomplete in that respect.
-    
-* The AFL contains a complete patent grant to the software. The BSD, MIT, 
-UoI/NCSA and Apache licenses rely on an implied patent license and contain 
-no explicit patent grant.
-    
-* The AFL makes it clear that no trademark rights are granted to the 
-licensor's trademarks. The Apache license contains such a provision, but the 
-BSD, MIT and UoI/NCSA licenses do not.
-    
-* The AFL includes the warranty by the licensor that it either owns the

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/Makefile.am Deleted

@@ -1,82 +0,0 @@
-# SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
-
-EXTRA_DIST = \
-	AUTHORS \
-	CONTRIBUTING.md \
-	COPYING \
-	README.md \
-	$(NULL)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(NULL)
-
-noinst_LTLIBRARIES = \
-	libdbus-gmain.la \
-	tests/libtest.la \
-	$(NULL)
-
-libdbus_gmain_la_SOURCES = \
-	dbus-gmain.c \
-	dbus-gmain.h \
-	$(NULL)
-
-libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
-libdbus_gmain_la_LDFLAGS = -no-undefined
-
-tests_libtest_la_SOURCES = \
-	tests/util.c \
-	tests/util.h \
-	$(NULL)
-
-tests_libtest_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
-tests_libtest_la_LDFLAGS = -no-undefined
-
-TESTS = \
-	tests/test-30574 \
-	$(NULL)
-
-noinst_PROGRAMS = \
-	tests/test-30574 \
-	tests/test-thread-server \
-	tests/test-thread-client \
-	$(NULL)
-
-tests_test_thread_server_SOURCES = \
-	tests/test-thread-server.c \
-	tests/test-thread.h \
-	$(NULL)
-tests_test_thread_server_LDADD = \
-	libdbus-gmain.la \
-	tests/libtest.la \
-	$(GLIB_THREADS_LIBS) \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
-	$(NULL)
-
-tests_test_thread_client_SOURCES = \
-	tests/test-thread-client.c \
-	tests/test-thread.h \
-	$(NULL)
-tests_test_thread_client_LDADD = \
-	libdbus-gmain.la \
-	tests/libtest.la \
-	$(GLIB_THREADS_LIBS) \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
-	$(NULL)
-
-tests_test_30574_SOURCES = \
-	tests/30574.c \
-	$(NULL)
-tests_test_30574_LDADD = \
-	libdbus-gmain.la \
-	tests/libtest.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
-	$(NULL)
-
-LOG_COMPILER = $(DBUS_RUN_SESSION) --

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/Makefile.in Deleted

@@ -1,1185 +0,0 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2020 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@
-
-# SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
-
-
-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@
-TESTS = tests/test-30574$(EXEEXT)
-noinst_PROGRAMS = tests/test-30574$(EXEEXT) \
-	tests/test-thread-server$(EXEEXT) \
-	tests/test-thread-client$(EXEEXT)
-subdir = dbus-gmain
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(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_is_release.m4 \
-	$(top_srcdir)/m4/ax_python_devel.m4 \
-	$(top_srcdir)/m4/ax_python_module.m4 \
-	$(top_srcdir)/m4/ax_require_defined.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 $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libdbus_gmain_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_libdbus_gmain_la_OBJECTS = dbus-gmain.lo
-libdbus_gmain_la_OBJECTS = $(am_libdbus_gmain_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 = 
-libdbus_gmain_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libdbus_gmain_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-tests_libtest_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_tests_libtest_la_OBJECTS = tests/util.lo
-tests_libtest_la_OBJECTS = $(am_tests_libtest_la_OBJECTS)
-tests_libtest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(tests_libtest_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_tests_test_30574_OBJECTS = tests/30574.$(OBJEXT)
-tests_test_30574_OBJECTS = $(am_tests_test_30574_OBJECTS)
-tests_test_30574_DEPENDENCIES = libdbus-gmain.la tests/libtest.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_tests_test_thread_client_OBJECTS =  \
-	tests/test-thread-client.$(OBJEXT)
-tests_test_thread_client_OBJECTS =  \
-	$(am_tests_test_thread_client_OBJECTS)
-tests_test_thread_client_DEPENDENCIES = libdbus-gmain.la \
-	tests/libtest.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_tests_test_thread_server_OBJECTS =  \
-	tests/test-thread-server.$(OBJEXT)
-tests_test_thread_server_OBJECTS =  \
-	$(am_tests_test_thread_server_OBJECTS)
-tests_test_thread_server_DEPENDENCIES = libdbus-gmain.la \
-	tests/libtest.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-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@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/dbus-gmain.Plo \
-	tests/$(DEPDIR)/30574.Po tests/$(DEPDIR)/test-thread-client.Po \
-	tests/$(DEPDIR)/test-thread-server.Po tests/$(DEPDIR)/util.Plo
-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    " $@;

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/dbus-gmain.c Deleted

@@ -1,665 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-gmain.c GLib main loop integration
- *
- * Copyright © 2002-2003 CodeFactory AB
- * Copyright © 2002-2010 Red Hat, Inc.
- * Copyright © 2003 James Willcox
- * Copyright © 2006 Marc-Andre Lureau
- * Copyright © 2006-2018 Collabora Ltd.
- * Copyright © 2010-2012 Mike Gorse
- *
- * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus-gmain/dbus-gmain.h>
-
-/*
- * DBusGMessageQueue:
- *
- * A GSource subclass for dispatching DBusConnection messages.
- * We need this on top of the IO handlers, because sometimes
- * there are messages to dispatch queued up but no IO pending.
- */
-typedef struct
-{
-  GSource source; /**< the parent GSource */
-  DBusConnection *connection; /**< the connection to dispatch */
-} DBusGMessageQueue;
-
-static gboolean message_queue_prepare  (GSource     *source,
-                                        gint        *timeout);
-static gboolean message_queue_check    (GSource     *source);
-static gboolean message_queue_dispatch (GSource     *source,
-                                        GSourceFunc  callback,
-                                        gpointer     user_data);
-
-static const GSourceFuncs message_queue_funcs = {
-  message_queue_prepare,
-  message_queue_check,
-  message_queue_dispatch,
-  NULL
-};
-
-static gboolean
-message_queue_prepare (GSource *source,
-                       gint    *timeout)
-{
-  DBusConnection *connection = ((DBusGMessageQueue *)source)->connection;
-
-  *timeout = -1;
-
-  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);
-}
-
-static gboolean
-message_queue_check (GSource *source)
-{
-  return FALSE;
-}
-
-static gboolean
-message_queue_dispatch (GSource     *source,
-                        GSourceFunc  callback,
-                        gpointer     user_data)
-{
-  DBusConnection *connection = ((DBusGMessageQueue *)source)->connection;
-
-  dbus_connection_ref (connection);
-
-  /* Only dispatch once - we don't want to starve other GSource */
-  dbus_connection_dispatch (connection);
-
-  dbus_connection_unref (connection);
-
-  return TRUE;
-}
-
-typedef struct
-{
-  GMainContext *context;      /**< the main context */
-  GSList *ios;                /**< all IOHandler */
-  GSList *timeouts;           /**< all TimeoutHandler */
-  DBusConnection *connection; /**< NULL if this is really for a server not a connection */
-  GSource *message_queue_source; /**< DBusGMessageQueue */
-} ConnectionSetup;
-
-
-typedef struct
-{
-  ConnectionSetup *cs;
-  GSource *source;
-  DBusWatch *watch;
-} IOHandler;
-
-typedef struct
-{
-  ConnectionSetup *cs;
-  GSource *source;
-  DBusTimeout *timeout;
-} TimeoutHandler;
-
-dbus_int32_t _dbus_gmain_connection_slot = -1;
-static dbus_int32_t server_slot = -1;
-
-static ConnectionSetup*
-connection_setup_new (GMainContext   *context,
-                      DBusConnection *connection)
-{
-  ConnectionSetup *cs;
-
-  cs = g_new0 (ConnectionSetup, 1);
-
-  g_assert (context != NULL);
-
-  cs->context = context;
-  g_main_context_ref (cs->context);
-
-  if (connection)
-    {
-      cs->connection = connection;
-
-      cs->message_queue_source = g_source_new ((GSourceFuncs *) &message_queue_funcs,
-                                               sizeof (DBusGMessageQueue));
-      ((DBusGMessageQueue*)cs->message_queue_source)->connection = connection;
-      g_source_attach (cs->message_queue_source, cs->context);
-    }
-
-  return cs;
-}
-
-static void
-io_handler_source_finalized (gpointer data)
-{
-  IOHandler *handler;
-
-  handler = data;
-
-  if (handler->watch)
-    dbus_watch_set_data (handler->watch, NULL, NULL);
-
-  g_free (handler);
-}
-
-static void
-io_handler_destroy_source (void *data)
-{
-  IOHandler *handler;
-
-  handler = data;
-
-  if (handler->source)
-    {
-      GSource *source = handler->source;
-      handler->source = NULL;
-      handler->cs->ios = g_slist_remove (handler->cs->ios, handler);
-      g_source_destroy (source);
-      g_source_unref (source);
-    }
-}
-
-static void
-io_handler_watch_freed (void *data)
-{
-  IOHandler *handler;
-
-  handler = data;
-
-  handler->watch = NULL;
-
-  io_handler_destroy_source (handler);
-}
-
-static gboolean
-io_handler_dispatch (GIOChannel   *source,
-                     GIOCondition  condition,
-                     gpointer      data)
-{
-  IOHandler *handler;
-  guint dbus_condition = 0;

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/tests Deleted

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/tests/30574.c Deleted

@@ -1,141 +0,0 @@
-/*
- * Copyright © 2010-2012 Mike Gorse
- * Copyright © 2011-2018 Collabora Ltd.
- *
- * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dbus/dbus.h>
-#include <glib.h>
-#include <dbus-gmain/dbus-gmain.h>
-#include "util.h"
-
-DBusConnection *bus;
-GMainContext *main_context;
-
-typedef struct _SpiReentrantCallClosure
-{
-  GMainLoop   *loop;
-  DBusMessage *reply;
-} SpiReentrantCallClosure;
-
-static void
-set_reply (DBusPendingCall * pending, void *user_data)
-{
-  SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
-
-  closure->reply = dbus_pending_call_steal_reply (pending);
-  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
-
-  g_main_loop_quit (closure->loop);
-}
-
-static DBusMessage *
-send_and_allow_reentry (DBusConnection * bus, DBusMessage * message,
-                        dbus_bool_t switch_after_send)
-{
-  DBusPendingCall *pending;
-  SpiReentrantCallClosure closure;
-
-  closure.loop = g_main_loop_new (main_context, FALSE);
-  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus,
-                                                (switch_after_send ? NULL :
-                                                                     main_context));
-
-  if (!dbus_connection_send_with_reply (bus, message, &pending, 3000))
-    {
-      DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
-      return NULL;
-    }
-  dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
-  if (switch_after_send)
-    DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, main_context);
-  g_main_loop_run  (closure.loop);
-
-  g_main_loop_unref (closure.loop);
-  dbus_pending_call_unref (pending);
-  return closure.reply;
-}
-
-static void
-send_test_message (dbus_bool_t switch_after_send)
-{
-  DBusMessage *message, *reply;
-  const char *str;
-  DBusError error;
-
-  dbus_error_init (&error);
-  message = dbus_message_new_method_call ("org.freedesktop.DBus",
-                                          "/org/freedesktop/DBus",
-                                          DBUS_INTERFACE_DBUS, "GetId");
-  reply = send_and_allow_reentry (bus, message, switch_after_send);
-  if (!reply)
-  {
-    fprintf(stderr, "Got no reply from send_and_allow_reentry\n");
-    exit(1);
-  }
-  if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
-  {
-    char *err = NULL;
-    dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
-    fprintf (stderr, "Got error: %s\n", err);
-    exit(1);
-  }
-  if (!dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
-  {
-    fprintf(stderr, "Sorry; can't communicate: %s\n", error.message);
-    exit(1);
-  }
-  dbus_message_unref (reply);
-  dbus_message_unref (message);
-}
-
-int
-main(int argc, const char *argv)
-{
-  DBusError error;
-
-  main_context = g_main_context_new ();
-  dbus_error_init (&error);
-  bus = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
-  if (!bus)
-  {
-    fprintf(stderr, "Couldn't connect to bus: %s\n", error.name);
-    return 1;
-  }
-  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
-  send_test_message (FALSE);
-  send_test_message (FALSE);
-  send_test_message (TRUE);
-
-  test_run_until_disconnected (bus, NULL);
-  dbus_connection_unref (bus);
-
-  dbus_shutdown ();
-  g_main_context_unref (main_context);
-
-  return 0;
-}

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/tests/test-thread-server.c Deleted

@@ -1,235 +0,0 @@
-/*
- * Copyright © 2003-2006 Red Hat Inc.
- * Copyright © 2006-2018 Collabora Ltd.
- *
- * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
- *
- * Licensed under the Academic Free License version 2.1
- *
- * 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 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <dbus-gmain/dbus-gmain.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "test-thread.h"
-
-typedef struct {
-  guint32 countersN_TEST_THREADS;
-} ThreadTestData;
-
-static ThreadTestData *
-thread_test_data_new (void)
-{
-  ThreadTestData *data;
-
-  data = g_new0 (ThreadTestData, 1);
-  
-  return data;
-}
-
-static void
-thread_test_data_free (ThreadTestData *data)
-{
-  g_free (data);
-}
-
-static DBusHandlerResult
-filter_test_message (DBusConnection     *connection,
-		     DBusMessage        *message,
-		     void               *user_data)
-{
-  ThreadTestData *data = user_data;
-  DBusMessageIter iter;
-  gint32 threadnr;
-  guint32 counter;
-  const char *str;
-  char *expected_str;
-  GString *counter_str;
-  int i;
-
-  if (!dbus_message_is_method_call (message, "org.freedesktop.DBus.GLib.ThreadTest",
-                                    "TestMethod"))
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-  
-  dbus_message_iter_init (message, &iter);
-  
-  if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32)
-    {
-      g_print ("First arg not right type\n");
-      goto out;
-    }
-   dbus_message_iter_get_basic (&iter, &threadnr);
-  if (threadnr < 0 || threadnr >= N_TEST_THREADS)
-    {
-      g_print ("Invalid thread nr\n");
-      goto out;
-    }
-
-  if (! dbus_message_iter_next (&iter))
-    {
-      g_print ("Couldn't get second arg\n");
-      goto out;
-    }
-
-  if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32)
-    {
-      g_print ("Second arg not right type\n");
-      goto out;
-    }
-  
-   dbus_message_iter_get_basic (&iter, &counter);
-
-  if (counter != data->countersthreadnr)
-    {
-      g_print ("Thread %d, counter %d, expected %d\n", threadnr, counter, data->countersthreadnr);
-      goto out;
-    }
-  data->countersthreadnr++;
-  
-  if (! dbus_message_iter_next (&iter))
-    {
-      g_print ("Couldn't get third arg\n");
-      goto out;
-    }
-
-  if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
-    {
-      g_print ("Third arg not right type\n");
-      goto out;
-    }
-
-  dbus_message_iter_get_basic (&iter, &str);
-
-  if (str == NULL)
-    {
-      g_print ("No third arg\n");
-      goto out;
-    }
-
-  expected_str = g_strdup_printf ("Thread %d-%d\n", threadnr, counter);
-  if (strcmp (expected_str, str) != 0)
-    {
-      g_print ("Wrong string '%s', expected '%s'\n", str, expected_str);
-      g_free (expected_str);
-      goto out;
-    }
-  g_free (expected_str);
-
-  if (dbus_message_iter_next (&iter))
-    {
-      g_print ("Extra args on end of message\n");
-      goto out;
-    }
-  
-  dbus_connection_flush (connection);
-
-  counter_str = g_string_new ("");
-  for (i = 0; i < N_TEST_THREADS; i++)
-    {
-      g_string_append_printf (counter_str, "%d ", data->countersi);
-    }
-  g_print ("%s\r", counter_str->str);
-  g_string_free (counter_str, TRUE);
-  
- out:
-  return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult
-filter_disconnect (DBusConnection     *connection,
-                   DBusMessage        *message,
-                   void               *user_data)
-{
-  if (!dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL,
-                               "Disconnected"))
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-  g_print ("connection disconnected\n");
-  dbus_connection_unref (connection);
-  
-  return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static void
-new_connection_callback (DBusServer     *server,
-                         DBusConnection *new_connection,
-                         void           *user_data)
-{
-  ThreadTestData * data;
-
-  g_print ("new_connection_callback\n");
-  
-  dbus_connection_ref (new_connection);
-  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (new_connection, NULL);
-
-  data = thread_test_data_new ();
-  
-  if (!dbus_connection_add_filter (new_connection,
-                                   filter_test_message, data,
-                                   (DBusFreeFunction) thread_test_data_free))
-    goto nomem;
-  
-  if (!dbus_connection_add_filter (new_connection,
-                                   filter_disconnect, NULL, NULL))
-    goto nomem;
-
-  return;
-  
- nomem:
-  g_error ("no memory to setup new connection");

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-gmain/tests/test-thread.h Deleted

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/gobject_service.py Deleted

@@ -1,88 +0,0 @@
-"""Support code for implementing D-Bus services via GObjects."""
-
-# Copyright (C) 2007 Collabora Ltd. <http://www.collabora.co.uk/>
-#
-# 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.
-
-import sys
-from warnings import warn as _warn
-_warn(DeprecationWarning("""\
-dbus.gobject_service is deprecated, and is not available under Python 3.
-
-Porting from gobject (PyGObject 2) to gi.repository.GObject (PyGObject 3),
-and using dbus.gi_service instead of dbus.gobject_service, is recommended.
-"""), DeprecationWarning, stacklevel=2)
-
-if 'gi' in sys.modules:
-    # this worked in dbus-python 1.0, so preserve the functionality
-    from gi.repository import GObject as gobject
-else:
-    # this worked in dbus-python < 1.0
-    import gobject
-
-import dbus.service
-
-class ExportedGObjectType(gobject.GObject.__class__, dbus.service.InterfaceType):
-    """A metaclass which inherits from both GObjectMeta and
-    `dbus.service.InterfaceType`. Used as the metaclass for `ExportedGObject`.
-    """
-    def __init__(cls, name, bases, dct):
-        gobject.GObject.__class__.__init__(cls, name, bases, dct)
-        dbus.service.InterfaceType.__init__(cls, name, bases, dct)
-
-class ExportedGObject(gobject.GObject, dbus.service.Object):
-    """A GObject which is exported on the D-Bus.
-
-    Because GObject and `dbus.service.Object` both have custom metaclasses,
-    the naive approach using simple multiple inheritance won't work. This
-    class has `ExportedGObjectType` as its metaclass, which is sufficient
-    to make it work correctly.
-    """
-    __metaclass__ = ExportedGObjectType
-
-    def __init__(self, conn=None, object_path=None, **kwargs):
-        """Initialize an exported GObject.
-
-        :Parameters:
-            `conn` : dbus.connection.Connection
-                The D-Bus connection or bus
-            `object_path` : str
-                The object path at which to register this object.
-        :Keywords:
-            `bus_name` : dbus.service.BusName
-                A bus name to be held on behalf of this object, or None.
-            `gobject_properties` : dict
-                GObject properties to be set on the constructed object.
-
-                Any unrecognised keyword arguments will also be interpreted
-                as GObject properties.
-            """
-        bus_name = kwargs.pop('bus_name', None)
-        gobject_properties = kwargs.pop('gobject_properties', None)
-
-        if gobject_properties is not None:
-            kwargs.update(gobject_properties)
-        gobject.GObject.__init__(self, **kwargs)
-        dbus.service.Object.__init__(self, conn=conn,
-                                     object_path=object_path,
-                                     bus_name=bus_name)

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-exception-py2.py Deleted

@@ -1,65 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# SPDX-License-Identifier: MIT
-
-import sys
-import unittest
-
-import dbus
-import dbus_test_utils
-
-# from test-service.py
-class ServiceError(dbus.DBusException):
-    """Exception representing a normal "environmental" error"""
-    include_traceback = False
-    _dbus_error_name = 'com.example.Networking.ServerError'
-
-
-class DBusExceptionTestCase(unittest.TestCase):
-    """Test the DBusException str/unicode behavior with py2"""
-
-    def test_dbus_exception_normal(self):
-        """Test the normal Exception behavior"""
-        e = dbus.exceptions.DBusException("baaa")
-        msg = e.get_dbus_message()
-        self.assertEqual(msg, u"baaa")
-
-    def test_dbus_exception_unicode(self):
-        """Test that DBusExceptions that take a py2 unicode work"""
-        e = dbus.exceptions.DBusException(u"bäää")
-        msg = e.get_dbus_message()
-        self.assertEqual(msg, u"bäää")
-
-    def test_dbus_exception_convert_str(self):
-        """Test that converting a DBusException to str() works as expected"""
-        e = dbus.exceptions.DBusException(u"bxxx")
-        self.assertEqual(str(e), "bxxx")
-
-    def test_dbus_exception_convert_str_fail(self):
-        """Test that a non-ascii Exception fails to convert to str"""
-        if sys.getdefaultencoding() == 'ascii':
-            self.assertRaises(UnicodeEncodeError,
-                    lambda: str(dbus.exceptions.DBusException(u"bä")))
-        else:
-            self.skipTest("you're using a weird non-ascii "
-                    "sys.getdefaultencoding()")
-
-    def test_dbus_exception_convert_unicode(self):
-        """Test that converting a DBusEception to unicode works"""
-        e = dbus.exceptions.DBusException(u"bäää")
-        self.assertEqual(e.get_dbus_message(), u"bäää")
-        self.assertEqual(e.__unicode__(), u"bäää")
-        self.assertEqual(unicode(e), u"bäää")
-
-    def test_subclass_exception_unicode(self):
-        """Test that DBusExceptions that take a py2 unicode work"""
-        e = ServiceError(u"bäää")
-        msg = e.get_dbus_message()
-        self.assertEqual(msg, u"bäää")
-        self.assertEqual(
-            unicode(e), u"com.example.Networking.ServerError: bäää")
-
-
-if __name__ == "__main__":
-    dbus_test_utils.main()

_service:tar_scm:dbus-python-1.3.2.tar.gz.asc Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/.reuse Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/.reuse/dep5 Added

_service:tar_scm:dbus-python-1.2.18.tar.gz/.version -> _service:tar_scm:dbus-python-1.3.2.tar.gz/.version Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/CONTRIBUTING.md -> _service:tar_scm:dbus-python-1.3.2.tar.gz/CONTRIBUTING.md Changed

@@ -136,7 +136,8 @@
 
 The `dbus-gmain` subproject is shared by `dbus-python` and `dbus-glib`,
 and has its own contributing guidelines (which are similar to these).
-Please see dbus-gmain/CONTRIBUTING.md(dbus-gmain/CONTRIBUTING.md)
+Please see
+subprojects/dbus-gmain/CONTRIBUTING.md(subprojects/dbus-gmain/CONTRIBUTING.md)
 for details.
 
 ## Information for maintainers
@@ -150,7 +151,7 @@
 dbus-glib(https://gitlab.freedesktop.org/dbus/dbus-glib) repository in
 the `../dbus-gmain` directory:
 
-    git subtree pull -P dbus-gmain ../dbus-gmain HEAD
+    git subtree pull -P subprojects/dbus-gmain ../dbus-gmain HEAD
 
 ### Committing other people's patches
 
@@ -166,7 +167,8 @@
 #### Pre-release steps
 
 * Make sure CI (currently Gitlab-CI) is passing
-* Update `NEWS` and the version number in `configure.ac`, and commit them
+* Update `NEWS` and the version numbers in **both** `configure.ac`
+  and `meson.build`, and commit them
 
 #### Building and uploading the release
 
@@ -186,4 +188,5 @@
 #### Post-release steps
 
 * Announce the new release to the D-Bus mailing list
-* Update `NEWS` and the version number in `configure.ac`, and commit them
+* Update `NEWS` and the version number in `configure.ac` and `meson.build`,
+  and commit them

_service:tar_scm:dbus-python-1.2.18.tar.gz/COPYING -> _service:tar_scm:dbus-python-1.3.2.tar.gz/COPYING Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/LICENSES Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/LICENSES/GPL-3.0-or-later.txt Added

@@ -0,0 +1,232 @@
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS
+
+0. Definitions.
+
+“This License” refers to version 3 of the GNU General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the Program.
+
+To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+
+A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+2. Basic Permissions.
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+
+     b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+
+     c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+
+     d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+     a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+
+     b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+
+     c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+
+     d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+
+     e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+
+7. Additional Terms.
+“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+
+     b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+
+     c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+
+     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+
+     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+
+     f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+
+8. Termination.
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+
+11. Patents.
+A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+

_service:tar_scm:dbus-python-1.3.2.tar.gz/LICENSES/LicenseRef-AutoconfArchiveException.txt Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/LICENSES/MIT.txt Added

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.

_service:tar_scm:dbus-python-1.2.18.tar.gz/MANIFEST -> _service:tar_scm:dbus-python-1.3.2.tar.gz/MANIFEST Changed

@@ -1,8 +1,12 @@
+.reuse/dep5
 .version
 AUTHORS
 CONTRIBUTING.md
 COPYING
 ChangeLog
+LICENSES/GPL-3.0-or-later.txt
+LICENSES/LicenseRef-AutoconfArchiveException.txt
+LICENSES/MIT.txt
 MANIFEST
 MANIFEST.in
 Makefile.am
@@ -24,20 +28,6 @@
 config.h.in
 configure
 configure.ac
-dbus-gmain/AUTHORS
-dbus-gmain/CONTRIBUTING.md
-dbus-gmain/COPYING
-dbus-gmain/Makefile.am
-dbus-gmain/Makefile.in
-dbus-gmain/README.md
-dbus-gmain/dbus-gmain.c
-dbus-gmain/dbus-gmain.h
-dbus-gmain/tests/30574.c
-dbus-gmain/tests/test-thread-client.c
-dbus-gmain/tests/test-thread-server.c
-dbus-gmain/tests/test-thread.h
-dbus-gmain/tests/util.c
-dbus-gmain/tests/util.h
 dbus-python.pc.in
 dbus/__init__.py
 dbus/_compat.py
@@ -49,7 +39,6 @@
 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
@@ -109,6 +98,8 @@
 doc/dbus.service.rst
 doc/dbus.types.rst
 doc/index.rst
+doc/maintainer-update-website.sh
+doc/meson.build
 doc/news.rst
 doc/redirects
 doc/redirects.py
@@ -143,17 +134,49 @@
 m4/ltversion.m4
 m4/lt~obsolete.m4
 m4/pkg.m4
+meson.build
+meson_options.txt
+pyproject.toml
+setup.cfg
 setup.py
+subprojects/dbus-gmain/AUTHORS
+subprojects/dbus-gmain/CONTRIBUTING.md
+subprojects/dbus-gmain/COPYING
+subprojects/dbus-gmain/LICENSES/AFL-2.1.txt
+subprojects/dbus-gmain/LICENSES/GPL-2.0-or-later.txt
+subprojects/dbus-gmain/LICENSES/MIT.txt
+subprojects/dbus-gmain/Makefile.am
+subprojects/dbus-gmain/Makefile.in
+subprojects/dbus-gmain/README.md
+subprojects/dbus-gmain/dbus-gmain.c
+subprojects/dbus-gmain/dbus-gmain/dbus-gmain.h
+subprojects/dbus-gmain/meson.build
+subprojects/dbus-gmain/meson_options.txt
+subprojects/dbus-gmain/tests/30574.c
+subprojects/dbus-gmain/tests/meson.build
+subprojects/dbus-gmain/tests/test-thread-client.c
+subprojects/dbus-gmain/tests/test-thread-server.c
+subprojects/dbus-gmain/tests/test-thread.h
+subprojects/dbus-gmain/tests/use-as-subproject.py
+subprojects/dbus-gmain/tests/use-as-subproject/README
+subprojects/dbus-gmain/tests/use-as-subproject/meson.build
+subprojects/dbus-gmain/tests/use-as-subproject/use-dbus-gmain.c
+subprojects/dbus-gmain/tests/util.c
+subprojects/dbus-gmain/tests/util.h
 test/TestSuitePythonService.service.in
+test/compiled.test.in
 test/cross-test-client.py
 test/cross-test-server.py
 test/crosstest.py
 test/dbus_py_test.c
 test/dbus_test_utils.py
 test/import-repeatedly.c
+test/installable/meson.build
+test/meson.build
+test/py.test.in
 test/run-test.sh
+test/sh.test.in
 test/test-client.py
-test/test-exception-py2.py
 test/test-exception-py3.py
 test/test-p2p.py
 test/test-service.py
@@ -166,3 +189,4 @@
 tools/check-coding-style.mk
 tools/check-py-style.sh
 tools/check-whitespace.sh
+tools/generate-pkginfo.py

_service:tar_scm:dbus-python-1.2.18.tar.gz/MANIFEST.in -> _service:tar_scm:dbus-python-1.3.2.tar.gz/MANIFEST.in Changed

@@ -1,8 +1,12 @@
+include .reuse/dep5
 include .version
 include AUTHORS
 include CONTRIBUTING.md
 include COPYING
 include ChangeLog
+include LICENSES/GPL-3.0-or-later.txt
+include LICENSES/LicenseRef-AutoconfArchiveException.txt
+include LICENSES/MIT.txt
 include MANIFEST
 include MANIFEST.in
 include Makefile.am
@@ -24,20 +28,6 @@
 include config.h.in
 include configure
 include configure.ac
-include dbus-gmain/AUTHORS
-include dbus-gmain/CONTRIBUTING.md
-include dbus-gmain/COPYING
-include dbus-gmain/Makefile.am
-include dbus-gmain/Makefile.in
-include dbus-gmain/README.md
-include dbus-gmain/dbus-gmain.c
-include dbus-gmain/dbus-gmain.h
-include dbus-gmain/tests/30574.c
-include dbus-gmain/tests/test-thread-client.c
-include dbus-gmain/tests/test-thread-server.c
-include dbus-gmain/tests/test-thread.h
-include dbus-gmain/tests/util.c
-include dbus-gmain/tests/util.h
 include dbus-python.pc.in
 include dbus/__init__.py
 include dbus/_compat.py
@@ -49,7 +39,6 @@
 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
@@ -109,6 +98,8 @@
 include doc/dbus.service.rst
 include doc/dbus.types.rst
 include doc/index.rst
+include doc/maintainer-update-website.sh
+include doc/meson.build
 include doc/news.rst
 include doc/redirects
 include doc/redirects.py
@@ -143,17 +134,49 @@
 include m4/ltversion.m4
 include m4/lt~obsolete.m4
 include m4/pkg.m4
+include meson.build
+include meson_options.txt
+include pyproject.toml
+include setup.cfg
 include setup.py
+include subprojects/dbus-gmain/AUTHORS
+include subprojects/dbus-gmain/CONTRIBUTING.md
+include subprojects/dbus-gmain/COPYING
+include subprojects/dbus-gmain/LICENSES/AFL-2.1.txt
+include subprojects/dbus-gmain/LICENSES/GPL-2.0-or-later.txt
+include subprojects/dbus-gmain/LICENSES/MIT.txt
+include subprojects/dbus-gmain/Makefile.am
+include subprojects/dbus-gmain/Makefile.in
+include subprojects/dbus-gmain/README.md
+include subprojects/dbus-gmain/dbus-gmain.c
+include subprojects/dbus-gmain/dbus-gmain/dbus-gmain.h
+include subprojects/dbus-gmain/meson.build
+include subprojects/dbus-gmain/meson_options.txt
+include subprojects/dbus-gmain/tests/30574.c
+include subprojects/dbus-gmain/tests/meson.build
+include subprojects/dbus-gmain/tests/test-thread-client.c
+include subprojects/dbus-gmain/tests/test-thread-server.c
+include subprojects/dbus-gmain/tests/test-thread.h
+include subprojects/dbus-gmain/tests/use-as-subproject.py
+include subprojects/dbus-gmain/tests/use-as-subproject/README
+include subprojects/dbus-gmain/tests/use-as-subproject/meson.build
+include subprojects/dbus-gmain/tests/use-as-subproject/use-dbus-gmain.c
+include subprojects/dbus-gmain/tests/util.c
+include subprojects/dbus-gmain/tests/util.h
 include test/TestSuitePythonService.service.in
+include test/compiled.test.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/dbus_test_utils.py
 include test/import-repeatedly.c
+include test/installable/meson.build
+include test/meson.build
+include test/py.test.in
 include test/run-test.sh
+include test/sh.test.in
 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
@@ -166,3 +189,4 @@
 include tools/check-coding-style.mk
 include tools/check-py-style.sh
 include tools/check-whitespace.sh
+include tools/generate-pkginfo.py

_service:tar_scm:dbus-python-1.2.18.tar.gz/Makefile.am -> _service:tar_scm:dbus-python-1.3.2.tar.gz/Makefile.am Changed

@@ -1,23 +1,32 @@
+# Copyright 2006-2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
 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}
 
-AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON)
+AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON) --with-python-prefix='$${prefix}' --with-python-exec-prefix='$${exec_prefix}'
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = dbus-gmain .
+SUBDIRS = subprojects/dbus-gmain .
 
 CLEANFILES = \
 	test/test-service.log \
 	$(NULL)
 EXTRA_DIST = \
+	.reuse/dep5 \
 	AUTHORS \
 	CONTRIBUTING.md \
 	COPYING \
+	LICENSES/GPL-3.0-or-later.txt \
+	LICENSES/LicenseRef-AutoconfArchiveException.txt \
+	LICENSES/MIT.txt \
 	dbus-python.pc.in \
 	doc/_static/.gitignore \
+	doc/maintainer-update-website.sh \
+	doc/meson.build \
 	examples/example-async-client.py \
 	examples/example-client.py \
 	examples/example-service.py \
@@ -28,14 +37,23 @@
 	examples/list-system-services.py \
 	examples/unix-fd-client.py \
 	examples/unix-fd-service.py \
+	meson.build \
+	meson_options.txt \
+	pyproject.toml \
+	setup.cfg \
 	setup.py \
 	test/TestSuitePythonService.service.in \
+	test/compiled.test.in \
+	test/installable/meson.build \
+	test/meson.build \
+	test/py.test.in \
+	test/sh.test.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 \
+	tools/check-whitespace.sh \
+	tools/generate-pkginfo.py \
 	$(NULL)
 
 # === C code ===
@@ -43,6 +61,8 @@
 AM_CPPFLAGS = \
 	-include config.h \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/subprojects \
+	-I$(top_srcdir)/subprojects/dbus-gmain \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PYTHON_CPPFLAGS) \
@@ -125,8 +145,8 @@
 	dbus_bindings/validation.c \
 	$(NULL)
 
-dbus-gmain/libdbus-gmain.la:
-	$(MAKE) -C dbus-gmain
+subprojects/dbus-gmain/libdbus-gmain.la:
+	$(MAKE) -C subprojects/dbus-gmain
 
 _dbus_glib_bindings_la_LDFLAGS = \
 	$(pymod_ldflags) \
@@ -134,7 +154,7 @@
 	$(AM_LDFLAGS) \
 	$(NULL)
 _dbus_glib_bindings_la_LIBADD = \
-	dbus-gmain/libdbus-gmain.la \
+	subprojects/dbus-gmain/libdbus-gmain.la \
 	$(pymod_libadd) \
 	$(DBUS_LIBS) \
 	$(NULL)
@@ -175,12 +195,6 @@
     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
 
@@ -241,6 +255,7 @@
 
 dist_test_py = \
 	test/test-client.py \
+	test/test-exception-py3.py \
 	test/test-p2p.py \
 	test/test-signals.py \
 	test/test-standalone.py \
@@ -259,12 +274,6 @@
 	test/wait-for-name.py \
 	$(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)
@@ -361,10 +370,16 @@
 
 dist-hook:
 	echo $(VERSION) > $(distdir)/.version
+	$(MKDIR_P) $(distdir)/dbus_python.egg-info
 	touch $(distdir)/MANIFEST
 	touch $(distdir)/MANIFEST.in
-	( cd $(distdir) && $(PYTHON) setup.py egg_info )
-	cp $(distdir)/dbus_python.egg-info/PKG-INFO $(distdir)
+	touch $(distdir)/dbus_python.egg-info/SOURCES.txt
+	$(PYTHON) $(distdir)/tools/generate-pkginfo.py $(VERSION) $(distdir)/PKG-INFO
+	echo > $(distdir)/dbus_python.egg-info/dependency_links.txt
+	echo _dbus_bindings > $(distdir)/dbus_python.egg-info/top_level.txt
+	echo _dbus_glib_bindings >> $(distdir)/dbus_python.egg-info/top_level.txt
+	echo dbus >> $(distdir)/dbus_python.egg-info/top_level.txt
+	cp $(distdir)/PKG-INFO $(distdir)/dbus_python.egg-info/PKG-INFO
 	( cd $(distdir) && find -type d -o -print ) | \
 		LC_ALL=C sort | \
 		$(SED) -e 's|^\./||' \
@@ -417,31 +432,31 @@
 	rm -fr $(DESTDIR)$(pythondir)/dbus/mainloop/__pycache__
 
 if ENABLE_DOCUMENTATION
-all: doc/_build/.stamp
+all: doc/html/.stamp
 
-doc/_build/.stamp: $(nobase_python_PYTHON) \
+doc/html/.stamp: $(nobase_python_PYTHON) \
 			_dbus_bindings.la \
 			_dbus_glib_bindings.la \
 			$(sphinx_sources) \
 			Makefile \
 			$(NULL)
-	rm -rf doc/_build
-	$(MKDIR_P) doc/_build
+	rm -rf doc/html
+	$(MKDIR_P) doc/html
 	abs_top_srcdir='$(abs_top_srcdir)' \
 	abs_top_builddir='$(abs_top_builddir)' \
 	DBUS_PYTHON_NO_DEPRECATED=1 \
-	$(PYTHON) -m sphinx -b html $(abs_top_srcdir)/doc doc/_build
+	$(PYTHON) -m sphinx -b html $(abs_top_srcdir)/doc doc/html
 	touch $@
 
-maintainer-update-website: doc/_build/.stamp
+maintainer-update-website: doc/html/.stamp
 	DBUS_TOP_SRCDIR="$(abs_top_srcdir)" \
 	$(PYTHON) $(srcdir)/doc/redirects.py
-	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/_build/ \
+	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/html/ \
 	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/
 
-install-data-local-sphinx: doc/_build/.stamp
+install-data-local-sphinx: doc/html/.stamp
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
-	cp -R doc/_build/* $(DESTDIR)$(htmldir)
+	cp -R doc/html/* $(DESTDIR)$(htmldir)
 
 uninstall-local-sphinx:
 	rm -fr $(DESTDIR)$(htmldir)
@@ -456,7 +471,7 @@
 endif
 
 clean-local:
-	rm -rf doc/_build
+	rm -rf doc/html
 
 check_c_sources = \
 	$(_dbus_bindings_la_SOURCES) \

_service:tar_scm:dbus-python-1.2.18.tar.gz/Makefile.in -> _service:tar_scm:dbus-python-1.3.2.tar.gz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,6 +14,9 @@
 
 @SET_MAKE@
 
+# Copyright 2006-2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
 
 
 
@@ -105,12 +108,6 @@
 @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)
@@ -140,7 +137,7 @@
 	$(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) $(dbusinclude_HEADERS) \
+	$(nobase_python_PYTHON) $(dbusinclude_HEADERS) \
 	$(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
@@ -213,8 +210,9 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(_dbus_bindings_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
-_dbus_glib_bindings_la_DEPENDENCIES = dbus-gmain/libdbus-gmain.la \
-	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
+_dbus_glib_bindings_la_DEPENDENCIES =  \
+	subprojects/dbus-gmain/libdbus-gmain.la $(am__DEPENDENCIES_3) \
+	$(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 \
@@ -241,16 +239,16 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(test_test_import_repeatedly_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__dist_noinst_SCRIPTS_DIST = test/test-client.py test/test-p2p.py \
+am__dist_noinst_SCRIPTS_DIST = test/test-client.py \
+	test/test-exception-py3.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/test-unusable-main-loop.py test/run-test.sh \
 	test/cross-test-client.py test/cross-test-server.py \
 	test/test-service.py test/wait-for-name.py
 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/test-exception-py3.py test/test-p2p.py \
+	test/test-signals.py test/test-standalone.py \
+	test/test-unusable-main-loop.py test/run-test.sh \
 	test/cross-test-client.py test/cross-test-server.py \
 	test/test-service.py test/wait-for-name.py
 SCRIPTS = $(dist_noinst_SCRIPTS) $(nobase_dist_installed_test_SCRIPTS)
@@ -340,13 +338,6 @@
 am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
 am__pep3147_tweak = \
   sed -e 's|\.py$$||' -e 's|^/*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|'
-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 = $(installed_test_meta_DATA) $(installed_test_test_DATA) \
 	$(noinst_DATA) $(pkgconfig_DATA)
@@ -378,9 +369,6 @@
   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__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
@@ -538,10 +526,9 @@
   bases=`echo $$bases`
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 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_2 = test/test-client.py test/test-exception-py3.py \
+	test/test-p2p.py test/test-signals.py test/test-standalone.py \
+	test/test-unusable-main-loop.py
 am__EXEEXT_3 = test/run-test.sh
 TEST_SUITE_LOG = test-suite.log
 LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
@@ -631,14 +618,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 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@
@@ -649,8 +634,10 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GREP = @GREP@
@@ -698,6 +685,7 @@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PLATFORM_SITE_PKG = @PYTHON_PLATFORM_SITE_PKG@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
@@ -770,32 +758,40 @@
 installed_testdir = ${libexecdir}/installed-tests/${PACKAGE_TARNAME}
 installed_test_testdir = ${installed_testdir}/test
 installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME}
-AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON)
+AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON) --with-python-prefix='$${prefix}' --with-python-exec-prefix='$${exec_prefix}'
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = dbus-gmain .
+SUBDIRS = subprojects/dbus-gmain .
 CLEANFILES = test/test-service.log $(NULL) $(noinst_DATA) \
 	$(installed_test_test_data) $(installed_test_metadata)
 
 # A hack used for the HTML documentation on dbus.freedesktop.org
-EXTRA_DIST = AUTHORS CONTRIBUTING.md COPYING dbus-python.pc.in \
-	doc/_static/.gitignore examples/example-async-client.py \
-	examples/example-client.py examples/example-service.py \
-	examples/example-signal-emitter.py \
+EXTRA_DIST = .reuse/dep5 AUTHORS CONTRIBUTING.md COPYING \
+	LICENSES/GPL-3.0-or-later.txt \
+	LICENSES/LicenseRef-AutoconfArchiveException.txt \
+	LICENSES/MIT.txt dbus-python.pc.in doc/_static/.gitignore \
+	doc/maintainer-update-website.sh doc/meson.build \
+	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 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 $(sphinx_sources) doc/redirects \
-	doc/redirects.py $(NULL)
+	examples/unix-fd-service.py meson.build meson_options.txt \
+	pyproject.toml setup.cfg setup.py \
+	test/TestSuitePythonService.service.in test/compiled.test.in \
+	test/installable/meson.build test/meson.build test/py.test.in \
+	test/sh.test.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/generate-pkginfo.py $(NULL) $(sphinx_sources) \
+	doc/redirects doc/redirects.py $(NULL)
 
 # === C code ===
 AM_CPPFLAGS = \
 	-include config.h \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/subprojects \

_service:tar_scm:dbus-python-1.2.18.tar.gz/NEWS -> _service:tar_scm:dbus-python-1.3.2.tar.gz/NEWS Changed

@@ -1,9 +1,97 @@
+dbus Python Bindings 1.3.2 (2022-09-06)
+=======================================
+
+Fixes:
+
+* Reinstate PKG-INFO and egg-info in source tarball, so that it can be
+  used as a PyPI sdist
+  (Simon McVittie)
+
+* Fix reStructured Text formatting in NEWS
+  (Simon McVittie)
+
+dbus Python Bindings 1.3.0 (2022-09-06)
+=======================================
+
+Dependencies:
+
+* Python 3, version 3.5 or later, is required.
+  An upstream-supported version (currently 3.7 or later) is strongly
+  recommended, and a future version of dbus-python is likely to require
+  Python 3.7 or later.
+  Python 2 is no longer supported.
+
+* Installing from source code using Meson requires Python 3.5 or later
+  and Meson 0.56.2 or later. This is now the recommended build system.
+
+* Installing from source code using Autotools requires Python 3.5 or later.
+  The Autotools build system is likely to be removed in a future version.
+
+* Installing from PyPI using pip or from source code via setup.py
+  requires Python 3.7 or later, Meson 0.60.3 or later, meson-python 0.8.1
+  or later, and their dependencies (ninja, patchelf, setuptools, wheel).
+
+API changes:
+
+* dbus.gobject_service, dbus.types.UTF8String and the utf8_strings
+  keyword argument were only usable with Python 2, and therefore have
+  been removed, along with the rest of the special cases for Python 2.
+  (dbus-python!15; Simon McVittie)
+
+Enhancements:
+
+* Add a Meson build system
+  (dbus-python!20; Simon McVittie)
+
+* Add methods to Message objects to manipulate the interactive
+  authorization flag
+  (dbus-python!17; Ricter Zheng)
+
+* Add licensing information in REUSE format
+  (dbus-python!20; Simon McVittie)
+
+Fixes:
+
+* Raise ValueError instead of crashing with assertion failure when a
+  Unix fd index number is greater than the number of fds actually attached
+  to the message (firewalld#985; Simon McVittie)
+
+* Raise ValueError instead of crashing with assertion failure when
+  a negative number is passed to the UnixFd constructor
+  (related to firewalld#985; Simon McVittie)
+
+* Fix undefined escape sequences in docstrings
+  (dbus-python#40; Jason A. Yundt)
+
+* Make `distcheck` compatible with Automake 1.16.4, by forcing an
+  appropriate prefix to be used
+  (dbus-python!15; Simon McVittie)
+
+* Update AX_PYTHON_DEVEL from autoconf-archive for better
+  forwards-compatibility
+  (dbus-python!15; Simon McVittie)
+
+* Avoid various deprecation warnings in the build system
+
+  - distutils.sysconfig → sysconfig
+  - distutils.util → sysconfig
+  - AC_PROG_LIBTOOL → LT_INIT
+  - AC_HELP_STRING → AS_HELP_STRING
+
+  (dbus-python!15; Simon McVittie)
+
+* Fix CI for recent Python and Automake versions
+  (dbus-python!15; Simon McVittie)
+
+* Update bug reporting URL
+  (dbus-python!15; Simon McVittie)
+
 dbus Python Bindings 1.2.18 (2021-07-20)
 ========================================
 
 Build-time configuration changes:
 
-• dbus-python will be built for python3 if neither PYTHON nor
+* dbus-python will be built for python3 if neither PYTHON nor
   PYTHON_VERSION is specified. Use a command like
 
       ./configure PYTHON=$(command -v python2)
@@ -12,50 +100,52 @@
 
 Dependencies:
 
-• Python 2 reached end-of-life on 2020-01-01. A future version of
+* 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
+* 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().
+* 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 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
+* Fix memory and fd leak if UnixFd is given an invalid negative
   variant_level (Simon McVittie)
 
-• Avoid more deprecation warnings:
+* 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
+* 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)
+* Convert examples to Python 3 (Simon McVittie)
 
-• Use the same Python executable for build and dist/distcheck by default
+* 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
+* 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
+* 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)
+* Also test with Python 3.10 on Ubuntu 21.10 (Simon McVittie)
 
-• Remove Travis-CI integration, only use Gitlab-CI (Simon McVittie)
+* Remove Travis-CI integration, only use Gitlab-CI (Simon McVittie)
 
 dbus Python Bindings 1.2.16 (2020-01-14)
 ========================================
@@ -64,13 +154,13 @@
 
 Enhancements:
 
-• All tests are run even if the tap.py module is not available, although
+* All tests are run even if the tap.py module is not available, although
   diagnostics for failing tests will be better if it is present.
   (Simon McVittie)
 
 Fixes:
 
-• Forbid unexpanded AX-prefixed macros more selectively, similar to
+* Forbid unexpanded AX-prefixed macros more selectively, similar to
   dbus#249. (Simon McVittie)
 
 dbus Python Bindings 1.2.14 (2019-11-25)
@@ -80,14 +170,14 @@
 
 Fixes:
 
-• Ensure that the numeric types from dbus.types get the same str()
+* Ensure that the numeric types from dbus.types get the same str()
   under Python 3.8 that they did under previous versions. Previously,
   Python 3.8 used their repr() for the str(), which was not intended.
   (dbus-python#31; matclab, Simon McVittie)
 
-• Disable -Winline (Simon McVittie)
+* Disable -Winline (Simon McVittie)
 
-• Add Python 3.8 to CI (Simon McVittie)
+* Add Python 3.8 to CI (Simon McVittie)
 
 dbus Python Bindings 1.2.12 (2019-09-12)
 ========================================
@@ -96,7 +186,7 @@

_service:tar_scm:dbus-python-1.2.18.tar.gz/PKG-INFO -> _service:tar_scm:dbus-python-1.3.2.tar.gz/PKG-INFO Changed

@@ -1,53 +1,61 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: dbus-python
-Version: 1.2.18
+Version: 1.3.2
 Summary: Python bindings for libdbus
+Keywords: dbus D-Bus
 Home-page: http://www.freedesktop.org/wiki/Software/DBusBindings/#python
-Maintainer: The D-Bus maintainers
-Maintainer-email: dbus@lists.freedesktop.org
+Maintainer-Email: The D-Bus maintainers <dbus@lists.freedesktop.org>
 License: Expat (MIT/X11)
-Download-URL: http://dbus.freedesktop.org/releases/dbus-python/
-Description: =======================================
-        dbus-python_: Python bindings for D-Bus
-        =======================================
-        
-        .. _dbus-python: http://www.freedesktop.org/wiki/Software/DBusBindings#python
-        
-        dbus-python is the original Python binding for ``dbus``, the reference
-        implementation of the D-Bus protocol.
-        
-        Online documentation can be found at
-        <http://dbus.freedesktop.org/doc/dbus-python/>.
-        
-        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://www.qt.io
-        .. _PyQT: http://www.riverbankcomputing.co.uk/software/pyqt/intro
-        
-Platform: UNKNOWN
 Classifier: Development Status :: 7 - Inactive
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: C
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Object Brokering
+Project-URL: Homepage, http://www.freedesktop.org/wiki/Software/DBusBindings/#python
+Project-URL: Download, http://dbus.freedesktop.org/releases/dbus-python/
+Project-URL: Source, https://gitlab.freedesktop.org/dbus/dbus-python/
+Project-URL: Tracker, https://gitlab.freedesktop.org/dbus/dbus-python/-/issues
+Requires-Python: >=3.7
+Provides-Extra: doc
+Provides-Extra: test
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx_rtd_theme; extra == "doc"
+Requires-Dist: tap.py; extra == "test"
+Description-Content-Type: text/x-rst
+
+=======================================
+dbus-python_: Python bindings for D-Bus
+=======================================
+
+.. _dbus-python: http://www.freedesktop.org/wiki/Software/DBusBindings#python
+
+dbus-python is the original Python binding for ``dbus``, the reference
+implementation of the D-Bus protocol.
+
+Online documentation can be found at
+<http://dbus.freedesktop.org/doc/dbus-python/>.
+
+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://www.qt.io
+.. _PyQT: http://www.riverbankcomputing.co.uk/software/pyqt/intro

_service:tar_scm:dbus-python-1.2.18.tar.gz/aclocal.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,13 @@
 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.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.71,,
+m4_warning(this file was generated for autoconf 2.71.
 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-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@
 am__api_version='1.16'
 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.16.3, ,
+m4_if($1, 1.16.5, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -51,14 +51,14 @@
 # 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.16.3)dnl
+AM_AUTOMAKE_VERSION(1.16.5)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-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -332,7 +332,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -400,7 +400,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -428,6 +428,10 @@
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
 AC_PREREQ(2.65)dnl
+m4_ifdef(_$0_ALREADY_INIT,
+  m4_fatal($0 expanded multiple times
+m4_defn(_$0_ALREADY_INIT)),
+  m4_define(_$0_ALREADY_INIT, m4_expansion_stack))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
@@ -464,7 +468,7 @@
 _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),
+  m4_ifset(AC_PACKAGE_NAME, ok):m4_ifset(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
@@ -516,6 +520,20 @@
 		  m4_define(AC_PROG_OBJCXX,
 			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
 )
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST(CTAGS)
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST(ETAGS)
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST(CSCOPE)
+
 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
@@ -597,7 +615,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -618,7 +636,7 @@
 fi
 AC_SUBST(install_sh))
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -640,7 +658,7 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -675,7 +693,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -718,7 +736,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -752,7 +770,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -781,7 +799,7 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -828,7 +846,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/compile -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/compile Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/config.guess -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/config.guess Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2018-02-24'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-09'
 
 # 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
+# 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
@@ -27,11 +29,19 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -50,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2022 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."
@@ -84,7 +94,8 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # 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
@@ -96,73 +107,90 @@
 
 # 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= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { 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" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       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
+}
 
 # 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
+if test -f /.attbin/uname ; 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_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "$UNAME_SYSTEM" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
 
-	# If ldd exists, use it to detect musl libc.
-	if command -v ldd >/dev/null && \
-		ldd --version 2>&1 | grep -q ^musl
-	then
-	    LIBC=musl
+	# Second heuristic to detect musl libc.
+	if  "$LIBC" = unknown  &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if  "$LIBC" = unknown ; then
+		LIBC=gnu
 	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+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*,
@@ -174,12 +202,12 @@
 	#
 	# 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 || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
 	    echo unknown)`
-	case "$UNAME_MACHINE_ARCH" in

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/config.sub -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/config.sub Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2018-02-22'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-03'
 
 # 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
+# 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
@@ -33,7 +35,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,6 +52,13 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -67,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2022 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."
@@ -89,7 +98,7 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -110,1223 +119,1186 @@
     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* | cloudabi*-eabi* | \
-  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
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### 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* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -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.2v4-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
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-lynx*)
-		os=-lynxos
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
 		;;
-	-ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/depcomp -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/depcomp Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/ltmain.sh -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/ltmain.sh Changed

@@ -1,12 +1,12 @@
-#! /bin/sh
+#! /usr/bin/env sh
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##               by inline-source v2014-01-03.01
+##               by inline-source v2019-02-19.15
 
-# libtool (GNU libtool) 2.4.6
+# libtool (GNU libtool) 2.4.7
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2022 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.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-15"
-package_revision=2.4.6
+VERSION="2.4.7 Debian-2.4.7-4"
+package_revision=2.4.7
 
 
 ## ------ ##
@@ -64,34 +64,25 @@
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2019-02-19.15; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-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.
-
-# 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 3 of the License, or
-# (at your option) any later version.
-
-# As a special exception to the GNU General Public License, if you distribute
-# this file as part of a program or library that is built using GNU Libtool,
-# you may include this file under the same distribution terms that you use
-# for the rest of that program.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNES 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 <http://www.gnu.org/licenses/>.
+# This is free software.  There is NO warranty; not even for
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Copyright (C) 2004-2019, 2021 Bootstrap Authors
+#
+# This file is dual licensed under the terms of the MIT license
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
+# these licenses when using or redistributing this software or any of
+# the files within it.  See the URLs above, or the file `LICENSE`
+# included in the Bootstrap distribution for the full license texts.
 
-# Please report bugs or propose patches to gary@gnu.org.
+# Please report bugs or propose patches to:
+# <https://github.com/gnulib-modules/bootstrap/issues>
 
 
 ## ------ ##
@@ -139,9 +130,12 @@
 	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# These NLS vars are set unconditionally (bootstrap issue #24).  Unset those
+# in case the environment reset is needed later and the $save_* variant is not
+# defined (see the code above).
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 # Make sure IFS has a sensible default
 sp=' '
@@ -159,6 +153,26 @@
 fi
 
 
+# func_unset VAR
+# --------------
+# Portably unset VAR.
+# In some shells, an 'unset VAR' statement leaves a non-zero return
+# status if VAR is already unset, which might be problematic if the
+# statement is used at the end of a function (thus poisoning its return
+# value) or when 'set -e' is active (causing even a spurious abort of
+# the script in this case).
+func_unset ()
+{
+    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
+}
+
+
+# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
+func_unset CDPATH
+
+# Make sure ${,E,F}GREP behave sanely.
+func_unset GREP_OPTIONS
+
 
 ## ------------------------- ##
 ## Locate command utilities. ##
@@ -259,7 +273,7 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
-  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
   rm -f conftest.sed
   SED=$func_path_progs_result
 }
@@ -295,7 +309,7 @@
     rm -f conftest.in conftest.tmp conftest.nl conftest.out
   }
 
-  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
   GREP=$func_path_progs_result
 }
 
@@ -360,6 +374,35 @@
   s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
   s/\n//g"
 
+# require_check_ifs_backslash
+# ---------------------------
+# Check if we can use backslash as IFS='\' separator, and set
+# $check_ifs_backshlash_broken to ':' or 'false'.
+require_check_ifs_backslash=func_require_check_ifs_backslash
+func_require_check_ifs_backslash ()
+{
+  _G_save_IFS=$IFS
+  IFS='\'
+  _G_check_ifs_backshlash='a\\b'
+  for _G_i in $_G_check_ifs_backshlash
+  do
+  case $_G_i in
+  a)
+    check_ifs_backshlash_broken=false
+    ;;
+  '')
+    break
+    ;;
+  *)
+    check_ifs_backshlash_broken=:
+    break
+    ;;
+  esac
+  done
+  IFS=$_G_save_IFS
+  require_check_ifs_backslash=:
+}
+
 
 ## ----------------- ##
 ## Global variables. ##
@@ -580,16 +623,16 @@
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1+=\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1+=\\ \$func_quote_arg_result"
   }'
 else
   func_append_quoted ()
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1=\$$1\\ \$func_quote_arg_result"
   }
 fi
 
@@ -1091,85 +1134,203 @@
 }
 
 
-# func_quote_for_eval ARG...

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/missing -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/missing Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/py-compile -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/py-compile Changed

@@ -1,9 +1,9 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2020-02-19.23; # UTC
+scriptversion=2021-02-27.01; # UTC
 
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
@@ -27,7 +27,7 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-if  -z "$PYTHON" ; then
+if test -z "$PYTHON"; then
   PYTHON=python
 fi
 
@@ -96,26 +96,26 @@
 
 files=$*
 if test -z "$files"; then
-    usage_error "no files given"
+  usage_error "no files given"
 fi
 
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
-if  -z "$basedir" ; then
-    pathtrans="path = file"
+if test -z "$basedir"; then
+  pathtrans="path = file"
 else
-    pathtrans="path = os.path.join('$basedir', file)"
+  pathtrans="path = os.path.join('$basedir', file)"
 fi
 
 # if destdir was given, then it needs to be prepended to the filename to
 # byte compile but not go into the compiled file.
-if  -z "$destdir" ; then
-    filetrans="filepath = path"
+if test -z "$destdir"; then
+  filetrans="filepath = path"
 else
-    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
+  filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
-python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
+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
@@ -176,7 +176,7 @@
         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 || :
+sys.stdout.write('\n')" 2>/dev/null || exit $?
 
 # Local Variables:
 # mode: shell-script

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/tap-driver.sh -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/tap-driver.sh Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/build-aux/test-driver -> _service:tar_scm:dbus-python-1.3.2.tar.gz/build-aux/test-driver Changed

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 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
@@ -105,8 +105,11 @@
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -128,7 +131,7 @@
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"

_service:tar_scm:dbus-python-1.2.18.tar.gz/config.h.in -> _service:tar_scm:dbus-python-1.3.2.tar.gz/config.h.in Changed

@@ -1,22 +1,13 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* dbus-python major version */
-#undef DBUS_PYTHON_MAJOR_VERSION
-
-/* dbus-python micro version */
-#undef DBUS_PYTHON_MICRO_VERSION
-
-/* dbus-python minor version */
-#undef DBUS_PYTHON_MINOR_VERSION
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
 
 /* If available, contains the Python version number currently in use. */
 #undef HAVE_PYTHON
@@ -24,6 +15,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -42,6 +36,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
@@ -66,44 +63,102 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
 #endif
 
 
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus

_service:tar_scm:dbus-python-1.2.18.tar.gz/configure -> _service:tar_scm:dbus-python-1.3.2.tar.gz/configure Changed

@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dbus-python 1.2.18.
+# Generated by GNU Autoconf 2.71 for dbus-python 1.3.2.
 #
-# Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=python>.
+# Report bugs to <https://gitlab.freedesktop.org/dbus/dbus-python/-/issues/new>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\$.*\$"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
-      esac;
-      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST

_service:tar_scm:dbus-python-1.2.18.tar.gz/configure.ac -> _service:tar_scm:dbus-python-1.3.2.tar.gz/configure.ac Changed

@@ -1,15 +1,11 @@
 -*- mode: m4 -*-
 AC_PREREQ(2.59c)
+# Copyright 2006-2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
 
-dnl The dbus-python version number
-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, 18)
-
-AC_INIT(dbus-python,
-  dbus_python_major_version.dbus_python_minor_version.dbus_python_micro_version,
-  http://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=python)
+AC_INIT(dbus-python, 1.3.2,
+  https://gitlab.freedesktop.org/dbus/dbus-python/-/issues/new)
 AC_CONFIG_MACRO_DIR(m4)
 m4_ifdef(AM_SILENT_RULES, AM_SILENT_RULES)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -23,12 +19,6 @@
 AM_MAINTAINER_MODE(enable)
 
 AX_IS_RELEASE(micro-version)
-AC_DEFINE(DBUS_PYTHON_MAJOR_VERSION, dbus_python_major_version, dbus-python major version)
-AC_SUBST(DBUS_PYTHON_MAJOR_VERSION, dbus_python_major_version)
-AC_DEFINE(DBUS_PYTHON_MINOR_VERSION, dbus_python_minor_version, dbus-python minor version)
-AC_SUBST(DBUS_PYTHON_MINOR_VERSION, dbus_python_minor_version)
-AC_DEFINE(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version, dbus-python micro version)
-AC_SUBST(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version)
 
 AC_CONFIG_SRCDIR(dbus_bindings/module.c)
 AC_CONFIG_HEADERS(config.h)
@@ -56,7 +46,7 @@
 dnl (copied from libglade/configure.in)
 m4_define(_LT_AC_TAGCONFIG,)
 
-AC_PROG_LIBTOOL
+LT_INIT
 AM_PROG_CC_C_O
 AC_C_INLINE
 AC_PROG_MKDIR_P
@@ -81,16 +71,11 @@
 AX_PYTHON_DEVEL(>= '2.7')
 AM_PATH_PYTHON
 
-# This command exits 0 (success) if sys.version >= "3", or 1 (failure)
-# if sys.version < "3" (i.e. starts with "2").
-AM_CONDITIONAL(HAVE_PYTHON_3,
-  $PYTHON -c "import sys; sys.exit(sys.version < '3')")
-
-PLATFORM=`$PYTHON -c "from __future__ import print_function; from distutils import util; print(util.get_platform())"`
+PLATFORM=`$PYTHON -c "import sysconfig; print(sysconfig.get_platform())"`
 AC_SUBST(PLATFORM)
 
 AC_ARG_ENABLE(installed-tests,
-  AC_HELP_STRING(--enable-installed tests,
+  AS_HELP_STRING(--enable-installed tests,
     install test programs and helpers for as-installed testing),
   ,
   enable_installed_tests=no)
@@ -99,7 +84,7 @@
 dnl Building documentation
 
 AC_ARG_ENABLE(documentation,
-  AC_HELP_STRING(--enable-documentation,
+  AS_HELP_STRING(--enable-documentation,
     Enable documentation building (requires sphinx and sphinx_rtd_theme)),
   :,
   enable_documentation=auto)
@@ -152,7 +137,7 @@
   )"
 
 AC_ARG_ENABLE(coding-style-checks,
-  AC_HELP_STRING(--enable-coding-style-checks,
+  AS_HELP_STRING(--enable-coding-style-checks,
                  check coding style using grep),
   ENABLE_CODING_STYLE_CHECKS=$enableval,
   ENABLE_CODING_STYLE_CHECKS=$ax_is_release)
@@ -164,7 +149,7 @@
 
 AC_CONFIG_FILES(
   Makefile
-  dbus-gmain/Makefile
   dbus-python.pc
+  subprojects/dbus-gmain/Makefile
 )
 AC_OUTPUT

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus-python.pc.in -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus-python.pc.in Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/__init__.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/__init__.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/_compat.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/_compat.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/_dbus.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/_dbus.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/bus.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/bus.py Changed

@@ -80,16 +80,12 @@
                                                    BUS_DAEMON_NAME,
                                                    BUS_DAEMON_PATH,
                                                    arg0=bus_name)
-        keywords = {}
-        if is_py2:
-            keywords'utf8_strings' = True
         self._pending_call = bus_conn.call_async(BUS_DAEMON_NAME,
                                                  BUS_DAEMON_PATH,
                                                  BUS_DAEMON_IFACE,
                                                  'GetNameOwner',
                                                  's', (bus_name,),
-                                                 callback, error_cb,
-                                                 **keywords)
+                                                 callback, error_cb)
 
     def cancel(self):
         if self._match is not None:
@@ -327,12 +323,9 @@
         :Returns: a dbus.Array of dbus.UTF8String
         :Since: 0.81.0
         """
-        keywords = {}
-        if is_py2:
-            keywords'utf8_strings' = True
         return self.call_blocking(BUS_DAEMON_NAME, BUS_DAEMON_PATH,
                                   BUS_DAEMON_IFACE, 'ListNames',
-                                  '', (), **keywords)
+                                  '', ())
 
     def list_activatable_names(self):
         """Return a list of all names that can be activated on the bus.
@@ -340,12 +333,9 @@
         :Returns: a dbus.Array of dbus.UTF8String
         :Since: 0.81.0
         """
-        keywords = {}
-        if is_py2:
-            keywords'utf8_strings' = True
         return self.call_blocking(BUS_DAEMON_NAME, BUS_DAEMON_PATH,
                                   BUS_DAEMON_IFACE, 'ListActivatableNames',
-                                  '', (), **keywords)
+                                  '', ())
 
     def get_name_owner(self, bus_name):
         """Return the unique connection name of the primary owner of the
@@ -354,13 +344,10 @@
         :Raises `DBusException`: if the `bus_name` has no owner
         :Since: 0.81.0
         """
-        keywords = {}
-        if is_py2:
-            keywords'utf8_strings' = True
         validate_bus_name(bus_name, allow_unique=False)
         return self.call_blocking(BUS_DAEMON_NAME, BUS_DAEMON_PATH,
                                   BUS_DAEMON_IFACE, 'GetNameOwner',
-                                  's', (bus_name,), **keywords)
+                                  's', (bus_name,))
 
     def watch_name_owner(self, bus_name, callback):
         """Watch the unique connection name of the primary owner of the

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/connection.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/connection.py Changed

@@ -39,10 +39,7 @@
 from dbus.proxies import ProxyObject
 from dbus._compat import is_py2, is_py3
 
-if is_py3:
-    from _dbus_bindings import String
-else:
-    from _dbus_bindings import UTF8String
+from _dbus_bindings import String
 
 
 _logger = logging.getLogger('dbus.connection')
@@ -59,8 +56,6 @@
               '_destination_keyword', '_interface_keyword',
               '_message_keyword', '_member_keyword',
               '_sender_keyword', '_path_keyword', '_int_args_match'
-    if is_py2:
-        _slots.append('_utf8_strings')
 
     __slots__ = tuple(_slots)
 
@@ -91,9 +86,7 @@
         # this later
         self._sender_name_owner = sender
 
-        if is_py2:
-            self._utf8_strings = kwargs.pop('utf8_strings', False)
-        elif 'utf8_strings' in kwargs:
+        if 'utf8_strings' in kwargs:
             raise TypeError("unexpected keyword argument 'utf8_strings'")
 
         self._byte_arrays = byte_arrays
@@ -186,15 +179,12 @@
         if self._sender_name_owner not in (None, message.get_sender()):
             return False
         if self._int_args_match is not None:
-            # extracting args with utf8_strings and byte_arrays is less work
+            # extracting args with byte_arrays is less work
             kwargs = dict(byte_arrays=True)
-            arg_type = (String if is_py3 else UTF8String)
-            if is_py2:
-                kwargs'utf8_strings' = True
             args = message.get_args_list(**kwargs)
             for index, value in self._int_args_match.items():
                 if (index >= len(args)
-                    or not isinstance(argsindex, arg_type)
+                    or not isinstance(argsindex, String)
                     or argsindex != value):
                     return False
 
@@ -210,12 +200,8 @@
             # minor optimization: if we already extracted the args with the
             # right calling convention to do the args match, don't bother
             # doing so again
-            utf8_strings = (is_py2 and self._utf8_strings)
-            if args is None or not utf8_strings or not self._byte_arrays:
-                kwargs = dict(byte_arrays=self._byte_arrays)
-                if is_py2:
-                    kwargs'utf8_strings' = self._utf8_strings
-                args = message.get_args_list(**kwargs)
+            if args is None or not self._byte_arrays:
+                args = message.get_args_list(byte_arrays=self._byte_arrays)
             kwargs = {}
             if self._sender_keyword is not None:
                 kwargsself._sender_keyword = message.get_sender()
@@ -392,7 +378,7 @@
                 this name.
             `arg...` : unicode or UTF-8 str
                 If there are additional keyword parameters of the form
-                ``arg``\ *n*, match only signals where the *n*\ th argument
+                ``arg``\\ *n*, match only signals where the *n*\\ th argument
                 is the value given for that keyword parameter. As of this
                 time only string arguments can be matched (in particular,
                 object paths and signatures can't).
@@ -572,9 +558,7 @@
         # no need to validate other args - MethodCallMessage ctor will do
 
         get_args_opts = dict(byte_arrays=byte_arrays)
-        if is_py2:
-            get_args_opts'utf8_strings' = kwargs.get('utf8_strings', False)
-        elif 'utf8_strings' in kwargs:
+        if 'utf8_strings' in kwargs:
             raise TypeError("unexpected keyword argument 'utf8_strings'")
 
         message = MethodCallMessage(destination=bus_name,
@@ -629,9 +613,7 @@
         # no need to validate other args - MethodCallMessage ctor will do
 
         get_args_opts = dict(byte_arrays=byte_arrays)
-        if is_py2:
-            get_args_opts'utf8_strings' = kwargs.get('utf8_strings', False)
-        elif 'utf8_strings' in kwargs:
+        if 'utf8_strings' in kwargs:
             raise TypeError("unexpected keyword argument 'utf8_strings'")
 
         message = MethodCallMessage(destination=bus_name,

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/decorators.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/decorators.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/exceptions.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/exceptions.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/proxies.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/proxies.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/service.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/service.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus/types.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus/types.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/abstract.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/abstract.c Changed

@@ -62,7 +62,7 @@
          */
         return 0;
     }
-    variant_level = NATIVEINT_ASLONG(vl_obj);
+    variant_level = PyLong_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
@@ -93,7 +93,7 @@
         }
     }
     else {
-        PyObject *vl_obj = NATIVEINT_FROMLONG(variant_level);
+        PyObject *vl_obj = PyLong_FromLong(variant_level);
         if (!vl_obj) {
             Py_CLEAR(key);
             return FALSE;
@@ -114,32 +114,8 @@
 {
     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);
 
@@ -151,7 +127,7 @@
     Py_CLEAR(key);
 
     if (!value)
-        return NATIVEINT_FROMLONG(0);
+        return PyLong_FromLong(0);
     Py_INCREF(value);
     return value;
 }
@@ -172,122 +148,11 @@
     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) */
 
-#ifdef PY3
 /* In Python >= 3.8 the tp_str for subclasses of built-in types prints
  * the subclass repr(), which does not match dbus-python's historical
  * behaviour. */
@@ -296,9 +161,6 @@
 {
     return (PyFloat_Type.tp_repr)(self);
 }
-#else
-#define DBusPythonFloat_tp_str 0
-#endif
 
 PyDoc_STRVAR(DBusPythonFloat_tp_doc,\
 "Base class for float subclasses with a ``variant_level`` attribute.\n"
@@ -405,7 +267,6 @@
     DBusPythonFloat_tp_new,                 /* tp_new */
 };
 
-#ifdef PY3
 /* Support code for bytes subclasses ================================== */

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/bus.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/bus.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/bytes.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/bytes.c Changed

@@ -32,12 +32,6 @@
 
 #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,
 "dbus.Byte(integer or bytes of length 1, variant_level)\n"
 "\n"
@@ -93,11 +87,11 @@
         if (PyBytes_GET_SIZE(obj) != 1) {
             goto bad_arg;
         }
-        obj = NATIVEINT_FROMLONG((unsigned char)(PyBytes_AS_STRING(obj)0));
+        obj = PyLong_FromLong((unsigned char)(PyBytes_AS_STRING(obj)0));
         if (!obj)
             goto bad_arg;
     }
-    else if (INTORLONG_CHECK(obj)) {
+    else if (PyLong_Check(obj)) {
         /* on Python 2 this accepts either int or long */
         long i = PyLong_AsLong(obj);
         long my_variant_level;
@@ -105,13 +99,9 @@
         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;
@@ -128,7 +118,7 @@
     tuple = Py_BuildValue("(N)", obj);
     if (!tuple) return NULL;
 
-    obj = DBUS_PY_BYTE_BASE.tp_new(cls, tuple, kwargs);
+    obj = DBusPyLongBase_Type.tp_new(cls, tuple, kwargs);
     Py_CLEAR(tuple);
     return obj;
 
@@ -144,7 +134,7 @@
 static PyObject *
 Byte_tp_str(PyObject *self)
 {
-    long i = NATIVEINT_ASLONG(self);
+    long i = PyLong_AsLong(self);
     unsigned char str2 = { 0, 0 };
 
     if (i == -1 && PyErr_Occurred())
@@ -189,7 +179,7 @@
         0,                                      /* tp_methods */
         0,                                      /* tp_members */
         0,                                      /* tp_getset */
-        DEFERRED_ADDRESS(&DBUS_PY_BYTE_BASE),   /* tp_base */
+        DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
         0,                                      /* tp_dict */
         0,                                      /* tp_descr_get */
         0,                                      /* tp_descr_set */
@@ -199,12 +189,6 @@
         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(str)\n"
 "\n"
@@ -265,7 +249,7 @@
         0,                                      /* tp_methods */
         0,                                      /* tp_members */
         0,                                      /* tp_getset */
-        DEFERRED_ADDRESS(&DBUS_PY_BYTEARRAY_BASE), /* tp_base */
+        DEFERRED_ADDRESS(&DBusPyBytesBase_Type), /* tp_base */
         0,                                      /* tp_dict */
         0,                                      /* tp_descr_get */
         0,                                      /* tp_descr_set */
@@ -278,17 +262,11 @@
 dbus_bool_t
 dbus_py_init_byte_types(void)
 {
-    DBusPyByte_Type.tp_base = &DBUS_PY_BYTE_BASE;
+    DBusPyByte_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyByte_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyByte_Type.tp_print = NULL;
-#endif
 
-    DBusPyByteArray_Type.tp_base = &DBUS_PY_BYTEARRAY_BASE;
+    DBusPyByteArray_Type.tp_base = &DBusPyBytesBase_Type;
     if (PyType_Ready(&DBusPyByteArray_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyByteArray_Type.tp_print = NULL;
-#endif
 
     return 1;
 }

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/conn-methods.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/conn-methods.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/conn.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/conn.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/containers.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/containers.c Changed

@@ -165,27 +165,16 @@
         const char *c_str;
         PyObject *signature_as_bytes;
 
-        if (
-#ifdef PY3
-            !PyUnicode_Check(signature)
-#else
-            !PyBytes_Check(signature)
-#endif
-            )
+        if (!PyUnicode_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);
 
@@ -394,20 +383,15 @@
         const char *c_str;
         PyObject *signature_as_bytes;
 
-        if (!NATIVESTR_CHECK(signature)) {
+        if (!PyUnicode_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_str0) {
@@ -687,31 +671,8 @@
 {
     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);
 
@@ -777,21 +738,12 @@
 
     DBusPyArray_Type.tp_base = &PyList_Type;
     if (PyType_Ready(&DBusPyArray_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyArray_Type.tp_print = NULL;
-#endif
 
     DBusPyDict_Type.tp_base = &PyDict_Type;
     if (PyType_Ready(&DBusPyDict_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyDict_Type.tp_print = NULL;
-#endif
 
     DBusPyStruct_Type.tp_base = &PyTuple_Type;
     if (PyType_Ready(&DBusPyStruct_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyStruct_Type.tp_print = NULL;
-#endif
 
     return 1;
 }

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/dbus_bindings-internal.h -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/dbus_bindings-internal.h Changed

@@ -92,29 +92,7 @@
     (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;
@@ -154,10 +132,6 @@
 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;

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/exceptions.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/exceptions.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/float.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/float.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/int.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/int.c Changed

@@ -29,14 +29,6 @@
 
 #include "types-internal.h"
 
-#ifdef PY3
-#define INTBASE (DBusPyLongBase_Type)
-#define LONG_TYPE_NAME "int"
-#else
-#define INTBASE (DBusPyIntBase_Type)
-#define LONG_TYPE_NAME "long"
-#endif
-
 /* Specific types =================================================== */
 
 /* Boolean, a subclass of DBusPythonInt ============================= */
@@ -75,7 +67,7 @@
     }
     tuple = Py_BuildValue("(i)", PyObject_IsTrue(value) ? 1 : 0);
     if (!tuple) return NULL;
-    self = (INTBASE.tp_new)(cls, tuple, kwargs);
+    self = (DBusPyLongBase_Type.tp_new)(cls, tuple, kwargs);
     Py_CLEAR(tuple);
     return self;
 }
@@ -90,13 +82,9 @@
 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;
@@ -143,7 +131,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&INTBASE),             /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -192,7 +180,7 @@
 static PyObject *
 Int16_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 {
-    PyObject *self = (INTBASE.tp_new)(cls, args, kwargs);
+    PyObject *self = (DBusPyLongBase_Type.tp_new)(cls, args, kwargs);
     if (self && dbus_py_int16_range_check(self) == -1 && PyErr_Occurred()) {
         Py_CLEAR(self);
         return NULL;
@@ -231,7 +219,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&INTBASE),             /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -280,7 +268,7 @@
 static PyObject *
 UInt16_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 {
-    PyObject *self = (INTBASE.tp_new)(cls, args, kwargs);
+    PyObject *self = (DBusPyLongBase_Type.tp_new)(cls, args, kwargs);
     if (self && dbus_py_uint16_range_check(self) == (dbus_uint16_t)(-1)
         && PyErr_Occurred())
     {
@@ -321,7 +309,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&INTBASE),             /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -370,7 +358,7 @@
 static PyObject *
 Int32_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 {
-    PyObject *self = (INTBASE.tp_new)(cls, args, kwargs);
+    PyObject *self = (DBusPyLongBase_Type.tp_new)(cls, args, kwargs);
     if (self && dbus_py_int32_range_check(self) == -1 && PyErr_Occurred()) {
         Py_CLEAR(self);
         return NULL;
@@ -409,7 +397,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&INTBASE),             /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -422,7 +410,7 @@
 /* UInt32 =========================================================== */
 
 PyDoc_STRVAR(UInt32_tp_doc,
-"dbus.UInt32(value: " LONG_TYPE_NAME ", variant_level: int)\n"
+"dbus.UInt32(value: int, variant_level: int)\n"
 "\n"
 "An unsigned 32-bit integer between 0 and 0xFFFF FFFF, represented as a\n"
 "subtype of ``long`` in Python 2 or ``int`` in Python 3.\n"
@@ -505,7 +493,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&DBusPyLongBase_Type),  /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -518,7 +506,7 @@
 /* Int64 =========================================================== */
 
 PyDoc_STRVAR(Int64_tp_doc,
-"dbus.Int64(value: " LONG_TYPE_NAME ", variant_level: int)\n"
+"dbus.Int64(value: int, variant_level: int)\n"
 "\n"
 "A signed 64-bit integer between -0x8000 0000 0000 0000 and\n"
 "+0x7FFF FFFF FFFF FFFF, represented as a\n"
@@ -611,7 +599,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&DBusPyLongBase_Type),  /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -624,7 +612,7 @@
 /* UInt64 =========================================================== */
 
 PyDoc_STRVAR(UInt64_tp_doc,
-"dbus.UInt64(value: " LONG_TYPE_NAME ", variant_level: int)\n"
+"dbus.UInt64(value: int, variant_level: int)\n"
 "\n"
 "An unsigned 64-bit integer between 0 and 0xFFFF FFFF FFFF FFFF,\n"
 "subtype of ``long`` in Python 2 or ``int`` in Python 3.\n"
@@ -712,7 +700,7 @@
     0,                                      /* tp_methods */
     0,                                      /* tp_members */
     0,                                      /* tp_getset */
-    DEFERRED_ADDRESS(&DBusPyLongBase_Type),  /* tp_base */
+    DEFERRED_ADDRESS(&DBusPyLongBase_Type), /* tp_base */
     0,                                      /* tp_dict */
     0,                                      /* tp_descr_get */
     0,                                      /* tp_descr_set */
@@ -725,51 +713,28 @@
 dbus_bool_t
 dbus_py_init_int_types(void)
 {
-    DBusPyInt16_Type.tp_base = &INTBASE;
+    DBusPyInt16_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyInt16_Type) < 0) return 0;
-#ifndef PY3
-    /* disable the tp_print copied from PyInt_Type, so tp_repr gets called as
-    desired */
-    DBusPyInt16_Type.tp_print = NULL;
-#endif
 
-    DBusPyUInt16_Type.tp_base = &INTBASE;
+    DBusPyUInt16_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyUInt16_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyUInt16_Type.tp_print = NULL;
-#endif
 
-    DBusPyInt32_Type.tp_base = &INTBASE;
+    DBusPyInt32_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyInt32_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyInt32_Type.tp_print = NULL;
-#endif
 
     DBusPyUInt32_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyUInt32_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyUInt32_Type.tp_print = NULL;
-#endif
 
 #if defined(DBUS_HAVE_INT64) && defined(HAVE_LONG_LONG)
     DBusPyInt64_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyInt64_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyInt64_Type.tp_print = NULL;
-#endif
 
     DBusPyUInt64_Type.tp_base = &DBusPyLongBase_Type;
     if (PyType_Ready(&DBusPyUInt64_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyUInt64_Type.tp_print = NULL;
-#endif

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/message-append.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/message-append.c Changed

@@ -44,11 +44,6 @@
     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;
     }
@@ -59,9 +54,7 @@
         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);
@@ -188,11 +181,11 @@
         *variant_level_ptr = variant_level;
     }
     else if (variant_level > 0) {
-        return NATIVESTR_FROMSTR(DBUS_TYPE_VARIANT_AS_STRING);
+        return PyUnicode_FromString(DBUS_TYPE_VARIANT_AS_STRING);
     }
 
     if (obj == Py_True || obj == Py_False) {
-      return NATIVESTR_FROMSTR(DBUS_TYPE_BOOLEAN_AS_STRING);
+      return PyUnicode_FromString(DBUS_TYPE_BOOLEAN_AS_STRING);
     }
 
     magic_attr = get_object_path(obj);
@@ -200,94 +193,67 @@
         return NULL;
     if (magic_attr != Py_None) {
         Py_CLEAR(magic_attr);
-        return NATIVESTR_FROMSTR(DBUS_TYPE_OBJECT_PATH_AS_STRING);
+        return PyUnicode_FromString(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);
+            return PyUnicode_FromString(DBUS_TYPE_UINT64_AS_STRING);
         else if (DBusPyInt64_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_INT64_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_INT64_AS_STRING);
         else if (DBusPyUInt32_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_UINT32_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_UINT32_AS_STRING);
         else if (DBusPyInt32_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_INT32_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_INT32_AS_STRING);
         else if (DBusPyUInt16_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_UINT16_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_UINT16_AS_STRING);
         else if (DBusPyInt16_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_INT16_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_INT16_AS_STRING);
         else if (DBusPyByte_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_BYTE_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_BYTE_AS_STRING);
         else if (DBusPyBoolean_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_BOOLEAN_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_BOOLEAN_AS_STRING);
         else
-            return NATIVESTR_FROMSTR(DBUS_TYPE_INT32_AS_STRING);
+            return PyUnicode_FromString(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);
+            return PyUnicode_FromString(DBUS_TYPE_OBJECT_PATH_AS_STRING);
         else if (DBusPySignature_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_SIGNATURE_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_SIGNATURE_AS_STRING);
         else
-            return NATIVESTR_FROMSTR(DBUS_TYPE_STRING_AS_STRING);
+            return PyUnicode_FromString(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);
+        return PyUnicode_FromString(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);
+            return PyUnicode_FromString(DBUS_TYPE_DOUBLE_AS_STRING);
         else if (DBusPyFloat_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_FLOAT_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_FLOAT_AS_STRING);
         else
 #endif
-            return NATIVESTR_FROMSTR(DBUS_TYPE_DOUBLE_AS_STRING);
+            return PyUnicode_FromString(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);
+            return PyUnicode_FromString(DBUS_TYPE_OBJECT_PATH_AS_STRING);
         else if (DBusPySignature_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_SIGNATURE_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_SIGNATURE_AS_STRING);
         else if (DBusPyByteArray_Check(obj))
-            return NATIVESTR_FROMSTR(DBUS_TYPE_ARRAY_AS_STRING
+            return PyUnicode_FromString(DBUS_TYPE_ARRAY_AS_STRING
                                      DBUS_TYPE_BYTE_AS_STRING);
         else
-            return NATIVESTR_FROMSTR(DBUS_TYPE_STRING_AS_STRING);
+            return PyUnicode_FromString(DBUS_TYPE_STRING_AS_STRING);
     }
     else if (PyTuple_Check(obj)) {
         Py_ssize_t len = PyTuple_GET_SIZE(obj);
@@ -304,12 +270,12 @@
             return NULL;
         }
         /* Set the first and last elements of list to be the parentheses */
-        item = NATIVESTR_FROMSTR(DBUS_STRUCT_BEGIN_CHAR_AS_STRING);
+        item = PyUnicode_FromString(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);
+        item = PyUnicode_FromString(DBUS_STRUCT_END_CHAR_AS_STRING);
         if (PyList_SetItem(list, len + 1, item) < 0) {
             Py_CLEAR(list);
             return NULL;
@@ -337,7 +303,7 @@
             }
             item = NULL;
         }
-        empty_str = NATIVESTR_FROMSTR("");
+        empty_str = PyUnicode_FromString("");
         if (!empty_str) {
             /* really shouldn't happen */
             Py_CLEAR(list);
@@ -351,9 +317,8 @@
     }
     else if (PyList_Check(obj)) {
         PyObject *tmp;
-        PyObject *ret = NATIVESTR_FROMSTR(DBUS_TYPE_ARRAY_AS_STRING);
+        PyObject *ret = PyUnicode_FromString(DBUS_TYPE_ARRAY_AS_STRING);
         if (!ret) return NULL;
-#ifdef PY3
         if (DBusPyArray_Check(obj) &&
             PyUnicode_Check(((DBusPyArray *)obj)->signature))
         {
@@ -362,14 +327,6 @@
             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) {

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/message-get-args.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/message-get-args.c Changed

@@ -45,11 +45,6 @@
 "       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 `bytes` objects (in 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"
@@ -75,9 +70,6 @@
 
 typedef struct {
     int byte_arrays;
-#ifndef PY3
-    int utf8_strings;
-#endif
 } Message_get_args_options;
 
 static PyObject *_message_iter_get_pyobject(DBusMessageIter *iter,
@@ -205,7 +197,7 @@
     if (variant_level > 0 && type != DBUS_TYPE_VARIANT) {
         PyObject *variant_level_int;
 
-        variant_level_int = NATIVEINT_FROMLONG(variant_level);
+        variant_level_int = PyLong_FromLong(variant_level);
         if (!variant_level_int) {
             return NULL;
         }
@@ -232,28 +224,16 @@
         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);
+            unicode = PyUnicode_DecodeUTF8(u.str, strlen(u.str), NULL);
+            if (!unicode) {
+                break;
             }
-            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
+            args = Py_BuildValue("(N)", unicode);
+            if (!args) {
+                break;
             }
-#endif
+            ret = PyObject_Call((PyObject *)&DBusPyString_Type,
+                                args, kwargs);
             break;
 
         case DBUS_TYPE_SIGNATURE:
@@ -327,7 +307,15 @@
 #ifdef DBUS_TYPE_UNIX_FD
         case DBUS_TYPE_UNIX_FD:
             DBG("%s", "found an unix fd");
+            /* Note that this can return an invalid fd (less than 0) if the
+             * sender has included an index numerically greater than the
+             * number of fds that were attached out-of-band to the message.
+             * libdbus cannot send messages like this, but GDBus can. */
             dbus_message_iter_get_basic(iter, &u.fd);
+            if (u.fd < 0) {
+                PyErr_Format(PyExc_ValueError, "invalid file descriptor in message");
+                break;
+            }
             args = Py_BuildValue("(i)", u.fd);
             if (args) {
                 ret = PyObject_Call((PyObject *)&DBusPyUnixFd_Type, args,
@@ -410,11 +398,7 @@
                      * 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);
@@ -498,13 +482,8 @@
 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;
 
@@ -524,16 +503,9 @@
                         "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);

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/message.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/message.c Changed

@@ -358,6 +358,30 @@
     Py_RETURN_NONE;
 }
 
+PyDoc_STRVAR(Message_get_allow_interactive_authorization__doc__,
+"message.get_allow_interactive_authorization(bool) -> None\n"
+"Get allow interactive authorization flag.\n");
+static PyObject *
+Message_get_allow_interactive_authorization(Message *self, PyObject *unused UNUSED)
+{
+    if (!self->msg) return DBusPy_RaiseUnusableMessage();
+    return PyBool_FromLong(dbus_message_get_allow_interactive_authorization(self->msg));
+}
+
+
+PyDoc_STRVAR(Message_set_allow_interactive_authorization__doc__,
+"message.set_allow_interactive_authorization(bool) -> None\n"
+"Set allow interactive authorization flag to this message.\n");
+static PyObject *
+Message_set_allow_interactive_authorization(Message *self, PyObject *args)
+{
+    int value;
+    if (!PyArg_ParseTuple(args, "i", &value)) return NULL;
+    if (!self->msg) return DBusPy_RaiseUnusableMessage();
+    dbus_message_set_allow_interactive_authorization(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");
@@ -392,7 +416,7 @@
 Message_get_type(Message *self, PyObject *unused UNUSED)
 {
     if (!self->msg) return DBusPy_RaiseUnusableMessage();
-    return NATIVEINT_FROMLONG(dbus_message_get_type(self->msg));
+    return PyLong_FromLong(dbus_message_get_type(self->msg));
 }
 
 PyDoc_STRVAR(Message_get_serial__doc__,
@@ -466,7 +490,7 @@
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return NATIVESTR_FROMSTR(c_str);
+    return PyUnicode_FromString(c_str);
 }
 
 PyDoc_STRVAR(Message_has_member__doc__,
@@ -541,7 +565,7 @@
         Py_RETURN_NONE;
     }
     for (ptr = paths; *ptr; ptr++) {
-        PyObject *str = NATIVESTR_FROMSTR(*ptr);
+        PyObject *str = PyUnicode_FromString(*ptr);
 
         if (!str) {
             Py_CLEAR(ret);
@@ -627,7 +651,7 @@
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return NATIVESTR_FROMSTR(c_str);
+    return PyUnicode_FromString(c_str);
 }
 
 PyDoc_STRVAR(Message_has_sender__doc__,
@@ -673,7 +697,7 @@
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return NATIVESTR_FROMSTR(c_str);
+    return PyUnicode_FromString(c_str);
 }
 
 PyDoc_STRVAR(Message_has_destination__doc__,
@@ -718,7 +742,7 @@
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return NATIVESTR_FROMSTR(c_str);
+    return PyUnicode_FromString(c_str);
 }
 
 PyDoc_STRVAR(Message_has_interface__doc__,
@@ -763,7 +787,7 @@
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return NATIVESTR_FROMSTR(c_str);
+    return PyUnicode_FromString(c_str);
 }
 
 PyDoc_STRVAR(Message_set_error_name__doc__,
@@ -837,6 +861,10 @@
       METH_NOARGS, Message_get_no_reply__doc__},
     {"set_no_reply", (PyCFunction) (void (*)(void))Message_set_no_reply,
       METH_VARARGS, Message_set_no_reply__doc__},
+    {"get_allow_interactive_authorization", (PyCFunction) (void (*)(void))Message_get_allow_interactive_authorization,
+    METH_NOARGS, Message_get_allow_interactive_authorization__doc__},
+    {"set_allow_interactive_authorization", (PyCFunction) (void (*)(void))Message_set_allow_interactive_authorization,
+    METH_VARARGS, Message_set_allow_interactive_authorization__doc__},
     {"get_reply_serial", (PyCFunction) (void (*)(void))Message_get_reply_serial,
       METH_NOARGS, Message_get_reply_serial__doc__},
     {"set_reply_serial", (PyCFunction) (void (*)(void))Message_set_reply_serial,

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/module.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/module.c Changed

@@ -235,17 +235,12 @@
 };
 
 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_APIDBUS_BINDINGS_API_COUNT;
 
-#ifdef PY3
     static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
         "_dbus_bindings",       /* m_name */
@@ -257,7 +252,6 @@
         NULL,                   /* m_clear */
         NULL                    /* m_free */
     };
-#endif
 
     dbus_bindings_API0 = (_dbus_py_func_ptr)&API_count;
     dbus_bindings_API1 = (_dbus_py_func_ptr)DBusPyConnection_BorrowDBusConnection;
@@ -281,12 +275,7 @@
     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;
@@ -409,26 +398,17 @@
     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: */

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/server.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/server.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/signature.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/signature.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/string.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/string.c Changed

@@ -30,103 +30,6 @@
 #include "types-internal.h"
 #include <structmember.h>
 
-#ifndef PY3
-/* UTF-8 string representation ====================================== */
-
-PyDoc_STRVAR(UTF8String_tp_doc,
-"dbus.UTF8String(value: bytes or unicode, variant_level: int=0)\n"
-"\n"
-"A string represented using UTF-8 - a subtype of `bytes`.\n"
-"This type is only available in Python 2.\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"
-"If value is a bytes object it must be valid UTF-8.\n"
-"\n"
-"variant_level must be non-negative; the default is 0.\n"
-"\n"
-".. py:attribute:: variant_level\n"
-"\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"
-"\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,
@@ -339,21 +242,9 @@
     }
     DBusPyString_Type.tp_base = &PyUnicode_Type;
     if (PyType_Ready(&DBusPyString_Type) < 0) return 0;
-#ifndef PY3
-    DBusPyString_Type.tp_print = NULL;
-#endif
-
-#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;
-#ifndef PY3
-    DBusPyObjectPath_Type.tp_print = NULL;
-#endif
 
     return 1;
 }
@@ -369,11 +260,6 @@
     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;
 }

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/types-internal.h -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/types-internal.h Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_bindings/unixfd.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_bindings/unixfd.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_glib_bindings/module.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_glib_bindings/module.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_python.egg-info/PKG-INFO -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_python.egg-info/PKG-INFO Changed

@@ -1,53 +1,61 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: dbus-python
-Version: 1.2.18
+Version: 1.3.2
 Summary: Python bindings for libdbus
+Keywords: dbus D-Bus
 Home-page: http://www.freedesktop.org/wiki/Software/DBusBindings/#python
-Maintainer: The D-Bus maintainers
-Maintainer-email: dbus@lists.freedesktop.org
+Maintainer-Email: The D-Bus maintainers <dbus@lists.freedesktop.org>
 License: Expat (MIT/X11)
-Download-URL: http://dbus.freedesktop.org/releases/dbus-python/
-Description: =======================================
-        dbus-python_: Python bindings for D-Bus
-        =======================================
-        
-        .. _dbus-python: http://www.freedesktop.org/wiki/Software/DBusBindings#python
-        
-        dbus-python is the original Python binding for ``dbus``, the reference
-        implementation of the D-Bus protocol.
-        
-        Online documentation can be found at
-        <http://dbus.freedesktop.org/doc/dbus-python/>.
-        
-        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://www.qt.io
-        .. _PyQT: http://www.riverbankcomputing.co.uk/software/pyqt/intro
-        
-Platform: UNKNOWN
 Classifier: Development Status :: 7 - Inactive
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: C
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Object Brokering
+Project-URL: Homepage, http://www.freedesktop.org/wiki/Software/DBusBindings/#python
+Project-URL: Download, http://dbus.freedesktop.org/releases/dbus-python/
+Project-URL: Source, https://gitlab.freedesktop.org/dbus/dbus-python/
+Project-URL: Tracker, https://gitlab.freedesktop.org/dbus/dbus-python/-/issues
+Requires-Python: >=3.7
+Provides-Extra: doc
+Provides-Extra: test
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx_rtd_theme; extra == "doc"
+Requires-Dist: tap.py; extra == "test"
+Description-Content-Type: text/x-rst
+
+=======================================
+dbus-python_: Python bindings for D-Bus
+=======================================
+
+.. _dbus-python: http://www.freedesktop.org/wiki/Software/DBusBindings#python
+
+dbus-python is the original Python binding for ``dbus``, the reference
+implementation of the D-Bus protocol.
+
+Online documentation can be found at
+<http://dbus.freedesktop.org/doc/dbus-python/>.
+
+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://www.qt.io
+.. _PyQT: http://www.riverbankcomputing.co.uk/software/pyqt/intro

_service:tar_scm:dbus-python-1.2.18.tar.gz/dbus_python.egg-info/SOURCES.txt -> _service:tar_scm:dbus-python-1.3.2.tar.gz/dbus_python.egg-info/SOURCES.txt Changed

@@ -1,8 +1,12 @@
+.reuse/dep5
 .version
 AUTHORS
 CONTRIBUTING.md
 COPYING
 ChangeLog
+LICENSES/GPL-3.0-or-later.txt
+LICENSES/LicenseRef-AutoconfArchiveException.txt
+LICENSES/MIT.txt
 MANIFEST
 MANIFEST.in
 Makefile.am
@@ -24,20 +28,6 @@
 config.h.in
 configure
 configure.ac
-dbus-gmain/AUTHORS
-dbus-gmain/CONTRIBUTING.md
-dbus-gmain/COPYING
-dbus-gmain/Makefile.am
-dbus-gmain/Makefile.in
-dbus-gmain/README.md
-dbus-gmain/dbus-gmain.c
-dbus-gmain/dbus-gmain.h
-dbus-gmain/tests/30574.c
-dbus-gmain/tests/test-thread-client.c
-dbus-gmain/tests/test-thread-server.c
-dbus-gmain/tests/test-thread.h
-dbus-gmain/tests/util.c
-dbus-gmain/tests/util.h
 dbus-python.pc.in
 dbus/__init__.py
 dbus/_compat.py
@@ -49,7 +39,6 @@
 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
@@ -109,6 +98,8 @@
 doc/dbus.service.rst
 doc/dbus.types.rst
 doc/index.rst
+doc/maintainer-update-website.sh
+doc/meson.build
 doc/news.rst
 doc/redirects
 doc/redirects.py
@@ -143,17 +134,49 @@
 m4/ltversion.m4
 m4/lt~obsolete.m4
 m4/pkg.m4
+meson.build
+meson_options.txt
+pyproject.toml
+setup.cfg
 setup.py
+subprojects/dbus-gmain/AUTHORS
+subprojects/dbus-gmain/CONTRIBUTING.md
+subprojects/dbus-gmain/COPYING
+subprojects/dbus-gmain/LICENSES/AFL-2.1.txt
+subprojects/dbus-gmain/LICENSES/GPL-2.0-or-later.txt
+subprojects/dbus-gmain/LICENSES/MIT.txt
+subprojects/dbus-gmain/Makefile.am
+subprojects/dbus-gmain/Makefile.in
+subprojects/dbus-gmain/README.md
+subprojects/dbus-gmain/dbus-gmain.c
+subprojects/dbus-gmain/dbus-gmain/dbus-gmain.h
+subprojects/dbus-gmain/meson.build
+subprojects/dbus-gmain/meson_options.txt
+subprojects/dbus-gmain/tests/30574.c
+subprojects/dbus-gmain/tests/meson.build
+subprojects/dbus-gmain/tests/test-thread-client.c
+subprojects/dbus-gmain/tests/test-thread-server.c
+subprojects/dbus-gmain/tests/test-thread.h
+subprojects/dbus-gmain/tests/use-as-subproject.py
+subprojects/dbus-gmain/tests/use-as-subproject/README
+subprojects/dbus-gmain/tests/use-as-subproject/meson.build
+subprojects/dbus-gmain/tests/use-as-subproject/use-dbus-gmain.c
+subprojects/dbus-gmain/tests/util.c
+subprojects/dbus-gmain/tests/util.h
 test/TestSuitePythonService.service.in
+test/compiled.test.in
 test/cross-test-client.py
 test/cross-test-server.py
 test/crosstest.py
 test/dbus_py_test.c
 test/dbus_test_utils.py
 test/import-repeatedly.c
+test/installable/meson.build
+test/meson.build
+test/py.test.in
 test/run-test.sh
+test/sh.test.in
 test/test-client.py
-test/test-exception-py2.py
 test/test-exception-py3.py
 test/test-p2p.py
 test/test-service.py
@@ -166,3 +189,4 @@
 tools/check-coding-style.mk
 tools/check-py-style.sh
 tools/check-whitespace.sh
+tools/generate-pkginfo.py

_service:tar_scm:dbus-python-1.3.2.tar.gz/doc/maintainer-update-website.sh Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/doc/meson.build Added

@@ -0,0 +1,56 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+doc_sources = files(
+    'API_CHANGES.txt',
+    'conf.py',
+    'dbus.bus.rst',
+    'dbus.connection.rst',
+    'dbus.decorators.rst',
+    'dbus.exceptions.rst',
+    'dbus.gi_service.rst',
+    'dbus.glib.rst',
+    'dbus.gobject_service.rst',
+    'dbus.lowlevel.rst',
+    'dbus.mainloop.rst',
+    'dbus.proxies.rst',
+    'dbus.rst',
+    'dbus.server.rst',
+    'dbus.service.rst',
+    'dbus.types.rst',
+    'index.rst',
+    'news.rst',
+    'PY3PORT.txt',
+    'tutorial.txt',
+    )
+
+sphinx = custom_target(
+    'sphinx',
+    command: 
+        py.full_path(),
+        '-m', 'sphinx',
+        '-b', 'html',
+        meson.current_source_dir(),
+        '@OUTPUT@',
+    ,
+    depends: 
+        dbus_bindings,
+        dbus_glib_bindings,
+    ,
+    input: python_sources + doc_sources,
+    output: 'html',
+    build_by_default: true,
+    install: true,
+    install_dir: get_option('datadir') / 'doc' / meson.project_name(),
+)
+
+custom_target(
+    'maintainer-update-website',
+    command: 
+        'env',
+        '--chdir', '@BUILD_ROOT@',
+        files('maintainer-update-website.sh'),
+    ,
+    depends: sphinx,
+    output: '_uploaded',
+)

_service:tar_scm:dbus-python-1.2.18.tar.gz/doc/redirects.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/doc/redirects.py Changed

@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+# Copyright 2018-2019 Collabora Ltd.
 # SPDX-License-Identifier: MIT
 
 import os
@@ -20,23 +21,23 @@
             page, dest = line.split(None, 1)
 
             try:
-                os.makedirs(os.path.join('doc', '_build', os.path.dirname(page)))
+                os.makedirs(os.path.join('doc', 'html', os.path.dirname(page)))
             except OSError:
                 pass
 
-            assert not os.path.exists(os.path.join('doc', '_build', page))
+            assert not os.path.exists(os.path.join('doc', 'html', page))
 
             if dest.startswith('"'):
                 assert page.endswith('.txt')
                 text = dest.strip('"')
 
-                with open(os.path.join('doc', '_build', page), 'w') as writer:
+                with open(os.path.join('doc', 'html', page), 'w') as writer:
                     writer.write(text)
                     writer.write('\n')
             else:
                 assert page.endswith('.html')
 
-                with open(os.path.join('doc', '_build', page), 'w') as writer:
+                with open(os.path.join('doc', 'html', page), 'w') as writer:
                     writer.write(
                         '<meta http-equiv="refresh" content="0; url={}" />\n'.format(
                             dest))

_service:tar_scm:dbus-python-1.2.18.tar.gz/include/dbus/dbus-python.h -> _service:tar_scm:dbus-python-1.3.2.tar.gz/include/dbus/dbus-python.h Changed

@@ -34,10 +34,7 @@
 #include <Python.h>
 #include <dbus/dbus.h>
 
-#if PY_MAJOR_VERSION >= 3
-#define PY3
 #define PYDBUS_CAPSULE_NAME "_dbus_bindings._C_API"
-#endif
 
 DBUS_BEGIN_DECLS
 
@@ -80,7 +77,6 @@
     }
     c_api = PyObject_GetAttrString(_dbus_bindings_module, "_C_API");
     if (c_api == NULL) return -1;
-#ifdef PY3
     dbus_bindings_API = NULL;
     if (PyCapsule_IsValid(c_api, PYDBUS_CAPSULE_NAME)) {
         dbus_bindings_API = (_dbus_py_func_ptr *)PyCapsule_GetPointer(
@@ -91,17 +87,6 @@
         PyErr_SetString(PyExc_RuntimeError, "C API is not a PyCapsule");
         return -1;
     }
-#else
-    if (PyCObject_Check(c_api)) {
-        dbus_bindings_API = (_dbus_py_func_ptr *)PyCObject_AsVoidPtr(c_api);
-    }
-    else {
-        Py_DECREF(c_api);
-        PyErr_SetString(PyExc_RuntimeError, "C API is not a PyCObject");
-        return -1;
-    }
-    Py_DECREF (c_api);
-#endif
     count = *(int *)dbus_bindings_API0;
     if (count < DBUS_BINDINGS_API_COUNT) {
         PyErr_Format(PyExc_RuntimeError,

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/ax_is_release.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/ax_is_release.m4 Changed

@@ -19,7 +19,8 @@
 #   The POLICY parameter specifies how ax_is_release is determined. It can
 #   take the following values:
 #
-#    * git-directory:  ax_is_release will be 'no' if a '.git' directory exists
+#    * git-directory:  ax_is_release will be 'no' if a '.git'
+#                      directory or git worktree exists
 #    * minor-version:  ax_is_release will be 'no' if the minor version number
 #                      in $PACKAGE_VERSION is odd; this assumes
 #                      $PACKAGE_VERSION follows the 'major.minor.micro' scheme
@@ -44,7 +45,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
-#serial 7
+#serial 8
 
 AC_DEFUN(AX_IS_RELEASE,
     AC_BEFORE(AC_INIT,$0)
@@ -52,7 +53,7 @@
     m4_case($1,
       git-directory,
         # $is_release = (.git directory does not exist)
-        AS_IF(test -d ${srcdir}/.git,ax_is_release=no,ax_is_release=yes)
+        AS_IF(test -d ${srcdir}/.git || (test -f ${srcdir}/.git && grep \.git/worktrees ${srcdir}/.git),ax_is_release=no,ax_is_release=yes)
       ,
       minor-version,
         # $is_release = ($minor_version is even)

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/ax_python_devel.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/ax_python_devel.m4 Changed

@@ -67,7 +67,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 21
+#serial 26
 
 AU_ALIAS(AC_PYTHON_DEVEL, AX_PYTHON_DEVEL)
 AC_DEFUN(AX_PYTHON_DEVEL,
@@ -112,15 +112,39 @@
 	fi
 
 	#
-	# if the macro parameter ``version'' is set, honour it
+	# If the macro parameter ``version'' is set, honour it.
+	# A Python shim class, VPy, is used to implement correct version comparisons via
+	# string expressions, since e.g. a naive textual ">= 2.7.3" won't work for
+	# Python 2.7.10 (the ".1" being evaluated as less than ".3").
 	#
 	if test -n "$1"; then
 		AC_MSG_CHECKING(for a version of Python $1)
-		ac_supports_python_ver=`$PYTHON -c "import sys; \
-			ver = sys.version.split ()0; \
+                cat << EOF > ax_python_devel_vpy.py
+class VPy:
+    def vtup(self, s):
+        return tuple(map(int, s.strip().replace("rc", ".").split(".")))
+    def __init__(self):
+        import sys
+        self.vpy = tuple(sys.version_info)
+    def __eq__(self, s):
+        return self.vpy == self.vtup(s)
+    def __ne__(self, s):
+        return self.vpy != self.vtup(s)
+    def __lt__(self, s):
+        return self.vpy < self.vtup(s)
+    def __gt__(self, s):
+        return self.vpy > self.vtup(s)
+    def __le__(self, s):
+        return self.vpy <= self.vtup(s)
+    def __ge__(self, s):
+        return self.vpy >= self.vtup(s)
+EOF
+		ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \
+                        ver = ax_python_devel_vpy.VPy(); \
 			print (ver $1)"`
+                rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py*
 		if test "$ac_supports_python_ver" = "True"; then
-		   AC_MSG_RESULT(yes)
+			AC_MSG_RESULT(yes)
 		else
 			AC_MSG_RESULT(no)
 			AC_MSG_ERROR(this package requires Python $1.
@@ -135,16 +159,25 @@
 	#
 	# Check if you have distutils, else fail
 	#
-	AC_MSG_CHECKING(for the distutils Python package)
-	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+	AC_MSG_CHECKING(for the sysconfig Python package)
+	ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
 	if test $? -eq 0; then
 		AC_MSG_RESULT(yes)
+		IMPORT_SYSCONFIG="import sysconfig"
 	else
 		AC_MSG_RESULT(no)
-		AC_MSG_ERROR(cannot import Python module "distutils".
+
+		AC_MSG_CHECKING(for the distutils Python package)
+		ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
+		if test $? -eq 0; then
+			AC_MSG_RESULT(yes)
+			IMPORT_SYSCONFIG="from distutils import sysconfig"
+		else
+			AC_MSG_ERROR(cannot import Python module "distutils".
 Please check your Python installation. The error was:
-$ac_distutils_result)
-		PYTHON_VERSION=""
+$ac_sysconfig_result)
+			PYTHON_VERSION=""
+		fi
 	fi
 
 	#
@@ -152,10 +185,19 @@
 	#
 	AC_MSG_CHECKING(for Python include path)
 	if test -z "$PYTHON_CPPFLAGS"; then
-		python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc ());"`
-		plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
+		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
+			# sysconfig module has different functions
+			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_path ('include'));"`
+			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_path ('platinclude'));"`
+		else
+			# old distutils way
+			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_inc ());"`
+			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_inc (plat_specific=1));"`
+		fi
 		if test -n "${python_path}"; then
 			if test "${plat_python_path}" != "${python_path}"; then
 				python_path="-I$python_path -I$plat_python_path"
@@ -179,7 +221,7 @@
 
 # join all versioning strings, on some systems
 # major/minor numbers could be in different list elements
-from distutils.sysconfig import *
+from sysconfig import *
 e = get_config_var('VERSION')
 if e is not None:
 	print(e)
@@ -190,7 +232,7 @@
 				ac_python_version=$PYTHON_VERSION
 			else
 				ac_python_version=`$PYTHON -c "import sys; \
-					print (sys.version:3)"`
+					print ("%d.%d" % sys.version_info:2)"`
 			fi
 		fi
 
@@ -202,8 +244,8 @@
 		ac_python_libdir=`cat<<EOD | $PYTHON -
 
 # There should be only one
-import distutils.sysconfig
-e = distutils.sysconfig.get_config_var('LIBDIR')
+$IMPORT_SYSCONFIG
+e = sysconfig.get_config_var('LIBDIR')
 if e is not None:
 	print (e)
 EOD`
@@ -211,8 +253,8 @@
 		# Now, for the library:
 		ac_python_library=`cat<<EOD | $PYTHON -
 
-import distutils.sysconfig
-c = distutils.sysconfig.get_config_vars()
+$IMPORT_SYSCONFIG
+c = sysconfig.get_config_vars()
 if 'LDVERSION' in c:
 	print ('python'+c'LDVERSION')
 else:
@@ -231,7 +273,7 @@
 		else
 			# old way: use libpython from python_configdir
 			ac_python_libdir=`$PYTHON -c \
-			  "from distutils.sysconfig import get_python_lib as f; \
+			  "from sysconfig import get_python_lib as f; \
 			  import os; \
 			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
 			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
@@ -252,19 +294,66 @@
 	#
 	AC_MSG_CHECKING(for Python site-packages path)
 	if test -z "$PYTHON_SITE_PKG"; then
-		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_lib(0,0));"`
+		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
+			PYTHON_SITE_PKG=`$PYTHON -c "
+$IMPORT_SYSCONFIG;
+if hasattr(sysconfig, 'get_default_scheme'):
+    scheme = sysconfig.get_default_scheme()
+else:
+    scheme = sysconfig._get_default_scheme()
+if scheme == 'posix_local':
+    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
+    scheme = 'posix_prefix'
+prefix = '$prefix'
+if prefix == 'NONE':
+    prefix = '$ac_default_prefix'
+sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
+print(sitedir)"`
+		else
+			# distutils.sysconfig way
+			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+				print (sysconfig.get_python_lib(0,0));"`
+		fi
 	fi
 	AC_MSG_RESULT($PYTHON_SITE_PKG)
 	AC_SUBST(PYTHON_SITE_PKG)
 
 	#
+	# Check for platform-specific site packages
+	#
+	AC_MSG_CHECKING(for Python platform specific site-packages path)
+	if test -z "$PYTHON_PLATFORM_SITE_PKG"; then
+		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
+			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "
+$IMPORT_SYSCONFIG;
+if hasattr(sysconfig, 'get_default_scheme'):
+    scheme = sysconfig.get_default_scheme()
+else:
+    scheme = sysconfig._get_default_scheme()
+if scheme == 'posix_local':

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/libtool.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/libtool.m4 Changed

@@ -1,6 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
-# serial 58 LT_INIT
+# serial 59 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
 m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
+m4_require(_LT_DECL_FILECMD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
 m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
@@ -219,8 +221,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -777,7 +779,7 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
@@ -1041,8 +1043,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 cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR $AR_FLAGS 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
@@ -1066,17 +1068,12 @@
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # 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,*-darwin912*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.012,.*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*|11.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+    darwin*)
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
+        10.012,*|,*powerpc*-darwin5-8*)
+          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+        *)
+          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
@@ -1125,12 +1122,12 @@
     output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
     m4_if($1, CXX,
    if test yes != "$lt_cv_apple_cc_single_mod"; then
       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
     fi
 ,)
   else
@@ -1244,7 +1241,8 @@
 # _LT_WITH_SYSROOT
 # ----------------
 AC_DEFUN(_LT_WITH_SYSROOT,
-AC_MSG_CHECKING(for sysroot)
+m4_require(_LT_DECL_SED)dnl
+AC_MSG_CHECKING(for sysroot)
 AC_ARG_WITH(sysroot,
 AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
   Search for dependent libraries within DIR (or the compiler's sysroot
@@ -1261,7 +1259,7 @@
    fi
    ;; #(
  /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
@@ -1291,7 +1289,7 @@
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -1308,7 +1306,7 @@
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
@@ -1320,7 +1318,7 @@
 	;;
       esac
     else
-      case `/usr/bin/file conftest.$ac_objext` in
+      case `$FILECMD conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
@@ -1342,7 +1340,7 @@
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
@@ -1350,7 +1348,7 @@
 	emul="${emul}64"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -1358,7 +1356,7 @@
 	emul="${emul}ltsmip"
 	;;
     esac
-    case `/usr/bin/file conftest.$ac_objext` in
+    case `$FILECMD conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
@@ -1378,14 +1376,14 @@
   # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
+	    case `$FILECMD conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -1453,7 +1451,7 @@
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case `$FILECMD conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
@@ -1492,9 +1490,22 @@
 m4_defun(_LT_PROG_AR,
 AC_CHECK_TOOLS(AR, ar, false)
 : ${AR=ar}

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/ltoptions.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/ltoptions.m4 Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/ltsugar.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/ltsugar.m4 Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/ltversion.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/ltversion.m4 Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/m4/lt~obsolete.m4 -> _service:tar_scm:dbus-python-1.3.2.tar.gz/m4/lt~obsolete.m4 Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/meson.build Added

@@ -0,0 +1,224 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+project(
+    'dbus-python',
+    'c',
+    default_options: 
+        'warning_level=2',
+    ,
+    meson_version: '>=0.56',
+    version: '1.3.2',
+)
+
+pc_mod = import('pkgconfig')
+py_mod = import('python')
+
+project_include_directories = include_directories('include')
+
+cc = meson.get_compiler('c')
+compile_warnings = 
+compile_warnings_c = 
+
+if cc.get_id() != 'msvc'
+  # -fno-common makes the linker more strict: on some systems the linker
+  # is *always* this strict, so we want to behave like that everywhere.
+  # We treat this like a warning, since that's basically how we're using it.
+  compile_warnings += '-fno-common'
+
+  compile_warnings += 
+      # Intentionally disabled: missing field initializers being implicitly
+      # default-initialized is a feature, not a bug
+      '-Wno-missing-field-initializers',
+
+      # Unfortunately the Python headers trigger various warnings
+      '-Wno-declaration-after-statement',
+      '-Wno-inline',
+      '-Wno-redundant-decls',
+      '-Wno-switch-default',
+      '-Wno-write-strings',
+
+      # General warnings for both C and C++, excluding those that are part
+      # of -Wall or -Wextra
+      '-Wcast-align',
+      '-Wdouble-promotion',
+      '-Wduplicated-cond',
+      '-Wfloat-equal',
+      '-Wformat-nonliteral',
+      '-Wformat-security',
+      '-Wformat=2',
+      '-Winit-self',
+      '-Wlogical-op',
+      '-Wmissing-declarations',
+      '-Wmissing-format-attribute',
+      '-Wmissing-include-dirs',
+      '-Wmissing-noreturn',
+      '-Wnull-dereference',
+      '-Wpacked',
+      '-Wpointer-arith',
+      '-Wshadow',
+      '-Wswitch-enum',
+      '-Wundef',
+      '-Wunused-but-set-variable',
+  
+
+  compile_warnings_c += 
+      # Extra warnings just for C
+      '-Wjump-misses-init',
+      '-Wmissing-prototypes',
+      '-Wnested-externs',
+      '-Wold-style-definition',
+      '-Wpointer-sign',
+      '-Wstrict-prototypes',
+  
+endif
+
+compile_warnings_c = cc.get_supported_arguments(compile_warnings + compile_warnings_c)
+add_project_arguments(compile_warnings_c, language: 'c')
+
+conf_data = configuration_data()
+conf_data.set_quoted('PACKAGE_VERSION', meson.project_version())
+configure_file(
+    output : '_dbus-python-config.h',
+    configuration: conf_data,
+)
+add_project_arguments('-include', '_dbus-python-config.h', language: 'c')
+
+# Bring dbus-gmain into our namespace
+redefine_dgmain_name = '_dbus_py_glib_ ## name'
+
+add_project_arguments(
+    '-DDBUS_GMAIN_FUNCTION_NAME(name)=' + redefine_dgmain_name,
+    language: 'c',
+)
+
+dbus_gmain = subproject(
+    'dbus-gmain',
+    default_options: 
+        'redefine_function_name=' + redefine_dgmain_name,
+        'tests=false',
+    ,
+)
+dbus_gmain_dep = dbus_gmain.get_variable('dbus_gmain_dep')
+
+if get_option('python') == ''
+    # This uses the same Python that was used to run Meson
+    py = py_mod.find_installation()
+else
+    py = py_mod.find_installation(get_option('python'))
+endif
+
+dbus_dep = dependency('dbus-1', version: '>=1.8')
+
+python_sources = files(
+    '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/proxies.py',
+    'dbus/server.py',
+    'dbus/service.py',
+    'dbus/types.py',
+)
+mainloop_sources = files(
+    'dbus/mainloop/__init__.py',
+    'dbus/mainloop/glib.py',
+)
+
+py.install_sources(
+    python_sources,
+    subdir: 'dbus',
+    pure: false,
+)
+py.install_sources(
+    mainloop_sources,
+    subdir: 'dbus/mainloop',
+    pure: false,
+)
+
+dbus_bindings = py.extension_module(
+    '_dbus_bindings',
+    sources: 
+        'dbus_bindings/abstract.c',
+        'dbus_bindings/bus.c',
+        'dbus_bindings/bytes.c',
+        'dbus_bindings/conn.c',
+        'dbus_bindings/conn-methods.c',
+        'dbus_bindings/containers.c',
+        '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/module.c',
+        'dbus_bindings/pending-call.c',
+        'dbus_bindings/server.c',
+        'dbus_bindings/signature.c',
+        'dbus_bindings/string.c',
+        'dbus_bindings/validation.c',
+    ,
+    dependencies: 
+        dbus_dep,
+        py.dependency(),
+    ,
+    include_directories: project_include_directories,
+    install: true,
+    # Workaround for https://github.com/mesonbuild/meson/issues/6331
+    # TODO: Remove this when we depend on Meson 0.60
+    subdir: '',
+)
+
+dbus_glib_bindings = py.extension_module(
+    '_dbus_glib_bindings',
+    sources: 
+        'dbus_glib_bindings/module.c',
+    ,
+    dependencies: 
+        dbus_dep,
+        dbus_gmain_dep,
+        py.dependency(),
+    ,
+    include_directories: project_include_directories,
+    install: true,
+    # Workaround for https://github.com/mesonbuild/meson/issues/6331
+    # TODO: Remove this when we depend on Meson 0.60
+    subdir: '',
+)

_service:tar_scm:dbus-python-1.3.2.tar.gz/meson_options.txt Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/pyproject.toml Added

@@ -0,0 +1,50 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+build-system
+build-backend = 'mesonpy'
+requires = 
+    'meson-python>=0.8.1',
+    'meson>=0.60.0',
+    'ninja',
+    'patchelf',
+    'setuptools',
+    'wheel',
+
+
+project
+name = 'dbus-python'
+license = { text = 'Expat (MIT/X11)' }
+description = 'Python bindings for libdbus'
+maintainers = 
+    { name = 'The D-Bus maintainers', email = 'dbus@lists.freedesktop.org' },
+
+requires-python = '>=3.7'
+readme = { file = 'README', content-type = 'text/x-rst' }
+keywords = 'dbus', 'D-Bus'
+classifiers = 
+    'Development Status :: 7 - Inactive',
+    'License :: OSI Approved :: MIT License',
+    'Programming Language :: C',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: Implementation :: CPython',
+    'Topic :: Software Development :: Object Brokering',
+
+dynamic = 
+    'version'
+
+
+project.optional-dependencies
+doc = 
+    'sphinx',
+    'sphinx_rtd_theme',
+
+test = 
+    'tap.py',
+
+
+project.urls
+homepage = 'http://www.freedesktop.org/wiki/Software/DBusBindings/#python'
+download = 'http://dbus.freedesktop.org/releases/dbus-python/'
+source = 'https://gitlab.freedesktop.org/dbus/dbus-python/'
+tracker = 'https://gitlab.freedesktop.org/dbus/dbus-python/-/issues'

_service:tar_scm:dbus-python-1.3.2.tar.gz/setup.cfg Added

@@ -0,0 +1,40 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+options
+python_requires = >=3.7
+setup_requires =
+    meson-python>=0.8.1
+    meson>=0.60.3
+    ninja
+    patchelf
+    setuptools
+    wheel
+zip_safe = False
+
+metadata
+name = dbus-python
+license = Expat (MIT/X11)
+description = Python bindings for libdbus
+maintainer = The D-Bus maintainers
+maintainer_email = dbus@lists.freedesktop.org
+long_description = file: README
+keywords =
+    dbus
+    D-Bus
+classifiers =
+    Development Status :: 7 - Inactive
+    License :: OSI Approved :: MIT License
+    Programming Language :: C
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: Implementation :: CPython
+    Topic :: Software Development :: Object Brokering
+url = http://www.freedesktop.org/wiki/Software/DBusBindings/#python
+download_url = http://dbus.freedesktop.org/releases/dbus-python/
+
+options.extras_require
+doc =
+    sphinx
+    sphinx_rtd_theme
+test =
+    tap.py

_service:tar_scm:dbus-python-1.2.18.tar.gz/setup.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/setup.py Changed

@@ -33,41 +33,83 @@
 import subprocess
 import sys
 
+
+if (
+    os.environ.get('DBUS_PYTHON_USE_AUTOTOOLS', '')
+    or sys.version_info < (3, 7)
+):
+    use_autotools = True
+    setup_requires = 'setuptools', 'wheel'
+else:
+    use_autotools = False
+    setup_requires = 'meson>=0.60.0', 'ninja', 'setuptools', 'wheel'
+
 if os.path.exists('.version'):
     version = open('.version').read().strip()
-else:
+elif use_autotools:
     version = subprocess.check_output('autoconf', '--trace', 'AC_INIT:$2',
         'configure.ac').decode('utf-8').strip()
+else:
+    with open('meson.build') as reader:
+        for line in reader:
+            if line.strip().replace(' ', '').startswith('version:'):
+                version = line.split(':', 1)1
+                version = version.replace(',', '')
+                version = version.replace('"', '')
+                version = version.replace("'", '')
+                break
+        else:
+            raise AssertionError('Cannot find version in meson.build')
 
 class Build(Distribution().get_command_class('build')):
-    """Dummy version of distutils build which runs an Autotools build system
-    instead.
+    """Dummy version of distutils build which runs an Autotools or Meson
+    build system instead.
     """
 
     def run(self):
         srcdir = os.getcwd()
         builddir = os.path.join(srcdir, self.build_temp)
-        configure = os.path.join(srcdir, 'configure')
         mkpath(builddir)
 
-        if not os.path.exists(configure):
-            configure = os.path.join(srcdir, 'autogen.sh')
+        if use_autotools:
+            configure = os.path.join(srcdir, 'configure')
+
+            if not os.path.exists(configure):
+                configure = os.path.join(srcdir, 'autogen.sh')
 
-        subprocess.check_call(
-                configure,
-                '--disable-maintainer-mode',
-                'PYTHON=' + sys.executable,
-                # Put the documentation, etc. out of the way: we only want
-                # the Python code and extensions
-                '--prefix=' + os.path.join(builddir, 'prefix'),
-            ,
-            cwd=builddir)
-        make_args = 
-            'pythondir=' + os.path.join(srcdir, self.build_lib),
-            'pyexecdir=' + os.path.join(srcdir, self.build_lib),
-        
-        subprocess.check_call('make', '-C', builddir + make_args)
-        subprocess.check_call('make', '-C', builddir, 'install' + make_args)
+            subprocess.check_call(
+                    configure,
+                    '--disable-maintainer-mode',
+                    'PYTHON=' + sys.executable,
+                    # Put the documentation, etc. out of the way: we only want
+                    # the Python code and extensions
+                    '--prefix=' + os.path.join(builddir, 'prefix'),
+                ,
+                cwd=builddir)
+            make_args = 
+                'pythondir=' + os.path.join(srcdir, self.build_lib),
+                'pyexecdir=' + os.path.join(srcdir, self.build_lib),
+            
+            subprocess.check_call('make', '-C', builddir + make_args)
+            subprocess.check_call('make', '-C', builddir, 'install' + make_args)
+        else:
+            subprocess.check_call(
+                
+                    sys.executable,
+                    '-m', 'mesonbuild.mesonmain',
+                    '--prefix=' + os.path.join(builddir, 'prefix'),
+                    '-Ddoc=false',
+                    '-Dinstalled_tests=false',
+                    '-Dpython=' + sys.executable,
+                    '-Dpython.platlibdir=' + os.path.join(srcdir, self.build_lib),
+                    '-Dpython.purelibdir=' + os.path.join(srcdir, self.build_lib),
+                    '-Dtests=false',
+                    srcdir,
+                    builddir,
+                
+            )
+            subprocess.check_call('meson', 'compile', '-C', builddir)
+            subprocess.check_call('meson', 'install', '-C', builddir)
 
 class BuildExt(Distribution().get_command_class('build_ext')):
     def run(self):
@@ -85,28 +127,13 @@
 setup(
     name='dbus-python',
     version=version,
-    description='Python bindings for libdbus',
-    long_description=open('README').read(),
-    maintainer='The D-Bus maintainers',
-    maintainer_email='dbus@lists.freedesktop.org',
-    download_url='http://dbus.freedesktop.org/releases/dbus-python/',
-    url='http://www.freedesktop.org/wiki/Software/DBusBindings/#python',
     packages='dbus',
     ext_modules=dbus_bindings, dbus_glib_bindings,
-    license='Expat (MIT/X11)',
-    classifiers=
-        'Development Status :: 7 - Inactive',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: C',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Topic :: Software Development :: Object Brokering',
-    ,
     cmdclass={
         'build': Build,
         'build_py': BuildPy,
         'build_ext': BuildExt,
     },
+    setup_requires=setup_requires,
     tests_require='tap.py',
 )

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/AUTHORS Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/CONTRIBUTING.md Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/COPYING Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/LICENSES Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/LICENSES/AFL-2.1.txt Added

@@ -0,0 +1,45 @@
+The Academic Free License
+v.2.1
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work:
+
+     Licensed under the Academic Free License version 2.1
+
+1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following:
+
+     a) to reproduce the Original Work in copies;
+     b) to prepare derivative works ("Derivative Works") based upon the Original Work;
+     c) to distribute copies of the Original Work and Derivative Works to the public;
+     d) to perform the Original Work publicly; and
+     e) to display the Original Work publicly.
+
+2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works.
+
+3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work.
+
+4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license.
+
+5) This section intentionally omitted.
+
+6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
+
+ 9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions.
+
+10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License.
+
+12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
+Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner.

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/LICENSES/GPL-2.0-or-later.txt Added

@@ -0,0 +1,117 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+     b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+     c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+     a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+
+     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 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, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+     Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+     Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/LICENSES/MIT.txt Added

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/Makefile.am Added

@@ -0,0 +1,101 @@
+# Copyright © 2002-2003 CodeFactory AB
+# Copyright © 2002-2010 Red Hat, Inc.
+# Copyright © 2003 James Willcox
+# Copyright © 2006 Marc-Andre Lureau
+# Copyright © 2006-2018 Collabora Ltd.
+# Copyright © 2010-2012 Mike Gorse
+#
+# SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+
+EXTRA_DIST = \
+	AUTHORS \
+	CONTRIBUTING.md \
+	COPYING \
+	LICENSES/AFL-2.1.txt \
+	LICENSES/GPL-2.0-or-later.txt \
+	LICENSES/MIT.txt \
+	README.md \
+	meson.build \
+	meson_options.txt \
+	tests/meson.build \
+	tests/use-as-subproject.py \
+	tests/use-as-subproject/README \
+	tests/use-as-subproject/meson.build \
+	tests/use-as-subproject/use-dbus-gmain.c \
+	$(NULL)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/subprojects \
+	-I$(top_builddir) \
+	-I$(top_builddir)/subprojects \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(NULL)
+
+noinst_LTLIBRARIES = \
+	libdbus-gmain.la \
+	tests/libtest.la \
+	$(NULL)
+
+libdbus_gmain_la_SOURCES = \
+	dbus-gmain.c \
+	dbus-gmain/dbus-gmain.h \
+	$(NULL)
+
+libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
+libdbus_gmain_la_LDFLAGS = -no-undefined
+
+tests_libtest_la_SOURCES = \
+	tests/util.c \
+	tests/util.h \
+	$(NULL)
+
+tests_libtest_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
+tests_libtest_la_LDFLAGS = -no-undefined
+
+TESTS = \
+	tests/test-30574 \
+	$(NULL)
+
+noinst_PROGRAMS = \
+	tests/test-30574 \
+	tests/test-thread-server \
+	tests/test-thread-client \
+	$(NULL)
+
+tests_test_thread_server_SOURCES = \
+	tests/test-thread-server.c \
+	tests/test-thread.h \
+	$(NULL)
+tests_test_thread_server_LDADD = \
+	libdbus-gmain.la \
+	tests/libtest.la \
+	$(GLIB_THREADS_LIBS) \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS) \
+	$(NULL)
+
+tests_test_thread_client_SOURCES = \
+	tests/test-thread-client.c \
+	tests/test-thread.h \
+	$(NULL)
+tests_test_thread_client_LDADD = \
+	libdbus-gmain.la \
+	tests/libtest.la \
+	$(GLIB_THREADS_LIBS) \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS) \
+	$(NULL)
+
+tests_test_30574_SOURCES = \
+	tests/30574.c \
+	$(NULL)
+tests_test_30574_LDADD = \
+	libdbus-gmain.la \
+	tests/libtest.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS) \
+	$(NULL)
+
+LOG_COMPILER = $(DBUS_RUN_SESSION) --

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/Makefile.in Added

@@ -0,0 +1,1202 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2021 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@
+
+# Copyright © 2002-2003 CodeFactory AB
+# Copyright © 2002-2010 Red Hat, Inc.
+# Copyright © 2003 James Willcox
+# Copyright © 2006 Marc-Andre Lureau
+# Copyright © 2006-2018 Collabora Ltd.
+# Copyright © 2010-2012 Mike Gorse
+#
+# SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+
+
+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@
+TESTS = tests/test-30574$(EXEEXT)
+noinst_PROGRAMS = tests/test-30574$(EXEEXT) \
+	tests/test-thread-server$(EXEEXT) \
+	tests/test-thread-client$(EXEEXT)
+subdir = subprojects/dbus-gmain
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(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_is_release.m4 \
+	$(top_srcdir)/m4/ax_python_devel.m4 \
+	$(top_srcdir)/m4/ax_python_module.m4 \
+	$(top_srcdir)/m4/ax_require_defined.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 $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libdbus_gmain_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_libdbus_gmain_la_OBJECTS = dbus-gmain.lo
+libdbus_gmain_la_OBJECTS = $(am_libdbus_gmain_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 = 
+libdbus_gmain_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libdbus_gmain_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+tests_libtest_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_tests_libtest_la_OBJECTS = tests/util.lo
+tests_libtest_la_OBJECTS = $(am_tests_libtest_la_OBJECTS)
+tests_libtest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(tests_libtest_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+am_tests_test_30574_OBJECTS = tests/30574.$(OBJEXT)
+tests_test_30574_OBJECTS = $(am_tests_test_30574_OBJECTS)
+tests_test_30574_DEPENDENCIES = libdbus-gmain.la tests/libtest.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_tests_test_thread_client_OBJECTS =  \
+	tests/test-thread-client.$(OBJEXT)
+tests_test_thread_client_OBJECTS =  \
+	$(am_tests_test_thread_client_OBJECTS)
+tests_test_thread_client_DEPENDENCIES = libdbus-gmain.la \
+	tests/libtest.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_tests_test_thread_server_OBJECTS =  \
+	tests/test-thread-server.$(OBJEXT)
+tests_test_thread_server_OBJECTS =  \
+	$(am_tests_test_thread_server_OBJECTS)
+tests_test_thread_server_DEPENDENCIES = libdbus-gmain.la \
+	tests/libtest.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+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@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/dbus-gmain.Plo \
+	tests/$(DEPDIR)/30574.Po tests/$(DEPDIR)/test-thread-client.Po \
+	tests/$(DEPDIR)/test-thread-server.Po tests/$(DEPDIR)/util.Plo
+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 =

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/README.md Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/dbus-gmain Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/dbus-gmain.c Added

@@ -0,0 +1,666 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-gmain.c GLib main loop integration
+ *
+ * Copyright © 2002-2003 CodeFactory AB
+ * Copyright © 2002-2010 Red Hat, Inc.
+ * Copyright © 2003 James Willcox
+ * Copyright © 2006 Marc-Andre Lureau
+ * Copyright © 2006-2018 Collabora Ltd.
+ * Copyright © 2010-2012 Mike Gorse
+ *
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * 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 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <dbus-gmain/dbus-gmain.h>
+
+/*
+ * DBusGMessageQueue:
+ *
+ * A GSource subclass for dispatching DBusConnection messages.
+ * We need this on top of the IO handlers, because sometimes
+ * there are messages to dispatch queued up but no IO pending.
+ */
+typedef struct
+{
+  GSource source; /**< the parent GSource */
+  DBusConnection *connection; /**< the connection to dispatch */
+} DBusGMessageQueue;
+
+static gboolean message_queue_prepare  (GSource     *source,
+                                        gint        *timeout);
+static gboolean message_queue_check    (GSource     *source);
+static gboolean message_queue_dispatch (GSource     *source,
+                                        GSourceFunc  callback,
+                                        gpointer     user_data);
+
+static const GSourceFuncs message_queue_funcs = {
+  message_queue_prepare,
+  message_queue_check,
+  message_queue_dispatch,
+  NULL
+};
+
+static gboolean
+message_queue_prepare (GSource *source,
+                       gint    *timeout)
+{
+  DBusConnection *connection = ((DBusGMessageQueue *)source)->connection;
+
+  *timeout = -1;
+
+  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);
+}
+
+static gboolean
+message_queue_check (G_GNUC_UNUSED GSource *source)
+{
+  return FALSE;
+}
+
+static gboolean
+message_queue_dispatch (GSource                   *source,
+                        G_GNUC_UNUSED GSourceFunc  callback,
+                        G_GNUC_UNUSED gpointer     user_data)
+{
+  DBusConnection *connection = ((DBusGMessageQueue *)source)->connection;
+
+  dbus_connection_ref (connection);
+
+  /* Only dispatch once - we don't want to starve other GSource */
+  dbus_connection_dispatch (connection);
+
+  dbus_connection_unref (connection);
+
+  return TRUE;
+}
+
+typedef struct
+{
+  GMainContext *context;      /**< the main context */
+  GSList *ios;                /**< all IOHandler */
+  GSList *timeouts;           /**< all TimeoutHandler */
+  DBusConnection *connection; /**< NULL if this is really for a server not a connection */
+  GSource *message_queue_source; /**< DBusGMessageQueue */
+} ConnectionSetup;
+
+
+typedef struct
+{
+  ConnectionSetup *cs;
+  GSource *source;
+  DBusWatch *watch;
+} IOHandler;
+
+typedef struct
+{
+  ConnectionSetup *cs;
+  GSource *source;
+  DBusTimeout *timeout;
+} TimeoutHandler;
+
+dbus_int32_t _dbus_gmain_connection_slot = -1;
+static dbus_int32_t server_slot = -1;
+
+static ConnectionSetup*
+connection_setup_new (GMainContext   *context,
+                      DBusConnection *connection)
+{
+  ConnectionSetup *cs;
+
+  cs = g_new0 (ConnectionSetup, 1);
+
+  g_assert (context != NULL);
+
+  cs->context = context;
+  g_main_context_ref (cs->context);
+
+  if (connection)
+    {
+      cs->connection = connection;
+
+      cs->message_queue_source = g_source_new ((GSourceFuncs *) &message_queue_funcs,
+                                               sizeof (DBusGMessageQueue));
+      ((DBusGMessageQueue*)cs->message_queue_source)->connection = connection;
+      g_source_attach (cs->message_queue_source, cs->context);
+    }
+
+  return cs;
+}
+
+static void
+io_handler_source_finalized (gpointer data)
+{
+  IOHandler *handler;
+
+  handler = data;
+
+  if (handler->watch)
+    dbus_watch_set_data (handler->watch, NULL, NULL);
+
+  g_free (handler);
+}
+
+static void
+io_handler_destroy_source (void *data)
+{
+  IOHandler *handler;
+
+  handler = data;
+
+  if (handler->source)
+    {
+      GSource *source = handler->source;
+      handler->source = NULL;
+      handler->cs->ios = g_slist_remove (handler->cs->ios, handler);
+      g_source_destroy (source);
+      g_source_unref (source);
+    }
+}
+
+static void
+io_handler_watch_freed (void *data)
+{
+  IOHandler *handler;
+
+  handler = data;
+
+  handler->watch = NULL;
+
+  io_handler_destroy_source (handler);
+}
+
+static gboolean
+io_handler_dispatch (G_GNUC_UNUSED GIOChannel   *source,
+                     GIOCondition                condition,
+                     gpointer                    data)
+{
+  IOHandler *handler;
+  guint dbus_condition = 0;

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/dbus-gmain/dbus-gmain.h Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/meson.build Added

@@ -0,0 +1,140 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+project(
+    'dbus-gmain',
+    'c',
+    default_options: 
+        'warning_level=2',
+    ,
+    meson_version: '>=0.56',
+)
+
+cc = meson.get_compiler('c')
+compile_warnings = 
+compile_warnings_c = 
+
+if cc.get_id() != 'msvc'
+  # -fno-common makes the linker more strict: on some systems the linker
+  # is *always* this strict, so we want to behave like that everywhere.
+  # We treat this like a warning, since that's basically how we're using it.
+  compile_warnings += '-fno-common'
+
+  compile_warnings += 
+      # Intentionally disabled: missing field initializers being implicitly
+      # default-initialized is a feature, not a bug
+      '-Wno-missing-field-initializers',
+
+      # General warnings for both C and C++, excluding those that are part
+      # of -Wall or -Wextra
+      '-Wcast-align',
+      '-Wdouble-promotion',
+      '-Wduplicated-branches',
+      '-Wduplicated-cond',
+      '-Wfloat-equal',
+      '-Wformat-nonliteral',
+      '-Wformat-security',
+      '-Wformat=2',
+      '-Winit-self',
+      '-Wlogical-op',
+      '-Wmissing-declarations',
+      '-Wmissing-format-attribute',
+      '-Wmissing-include-dirs',
+      '-Wmissing-noreturn',
+      '-Wnull-dereference',
+      '-Wpacked',
+      '-Wpointer-arith',
+      '-Wredundant-decls',
+      '-Wshadow',
+      '-Wswitch-default',
+      '-Wswitch-enum',
+      '-Wundef',
+      '-Wunused-but-set-variable',
+      '-Wwrite-strings',
+  
+
+  compile_warnings_c += 
+      # Extra warnings just for C
+      '-Wdeclaration-after-statement',
+      '-Wjump-misses-init',
+      '-Wmissing-prototypes',
+      '-Wnested-externs',
+      '-Wold-style-definition',
+      '-Wpointer-sign',
+      '-Wstrict-prototypes',
+  
+endif
+
+compile_warnings_c = cc.get_supported_arguments(
+    compile_warnings + compile_warnings_c,
+)
+add_project_arguments(compile_warnings_c, language: 'c')
+
+if get_option('redefine_function_declaration') != ''
+    if not get_option('redefine_function_declaration').contains('name')
+        error('redefine_function_declaration option needs to contain "name"')
+    endif
+
+    if not get_option('redefine_function_declaration').contains('ret')
+        error('redefine_function_declaration option needs to contain "ret"')
+    endif
+
+    if not get_option('redefine_function_declaration').contains('__VA_ARGS__')
+        error('redefine_function_declaration option needs to contain "__VA_ARGS__"')
+    endif
+
+    add_project_arguments(
+        '-DDBUS_GMAIN_FUNCTION(ret, name, ...)=@0@'.format(
+            get_option('redefine_function_declaration'),
+        ),
+        language: 'c',
+    )
+endif
+
+if get_option('redefine_function_name') != ''
+    if not get_option('redefine_function_name').contains('name')
+        error('redefine_function_name option needs to contain "name"')
+    endif
+
+    add_project_arguments(
+        '-DDBUS_GMAIN_FUNCTION_NAME(name)=@0@'.format(
+            get_option('redefine_function_name'),
+        ),
+        language: 'c',
+    )
+endif
+
+dbus_dep = dependency('dbus-1', version: '>=1.8')
+glib_dep = dependency('glib-2.0', version: '>=2.40')
+gthread_dep = dependency(
+    'gthread-2.0',
+    version: '>=2.40',
+    required: get_option('tests'),
+)
+
+libdbus_gmain = static_library(
+    'dbus-gmain',
+    'dbus-gmain.c',
+    dependencies: 
+        dbus_dep,
+        glib_dep,
+    ,
+)
+
+dbus_gmain_dep = declare_dependency(
+    dependencies: 
+        dbus_dep,
+        glib_dep,
+    ,
+    include_directories: include_directories('.'),
+    link_with: libdbus_gmain,
+)
+
+dbus_run_session = find_program(
+    'dbus-run-session',
+    required: get_option('tests'),
+)
+
+if get_option('tests')
+    subdir('tests')
+endif

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/meson_options.txt Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/30574.c Added

@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2010-2012 Mike Gorse
+ * Copyright © 2011-2018 Collabora Ltd.
+ *
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * 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 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <dbus/dbus.h>
+#include <glib.h>
+#include <dbus-gmain/dbus-gmain.h>
+#include "util.h"
+
+DBusConnection *bus;
+GMainContext *main_context;
+
+typedef struct _SpiReentrantCallClosure
+{
+  GMainLoop   *loop;
+  DBusMessage *reply;
+} SpiReentrantCallClosure;
+
+static void
+set_reply (DBusPendingCall * pending, void *user_data)
+{
+  SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
+
+  closure->reply = dbus_pending_call_steal_reply (pending);
+  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
+
+  g_main_loop_quit (closure->loop);
+}
+
+static DBusMessage *
+send_and_allow_reentry (DBusConnection *conn, DBusMessage *message,
+                        dbus_bool_t switch_after_send)
+{
+  DBusPendingCall *pending;
+  SpiReentrantCallClosure closure;
+
+  g_assert (conn == bus);
+
+  closure.loop = g_main_loop_new (main_context, FALSE);
+  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus,
+                                                (switch_after_send ? NULL :
+                                                                     main_context));
+
+  if (!dbus_connection_send_with_reply (bus, message, &pending, 3000))
+    {
+      DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
+      return NULL;
+    }
+  dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
+  if (switch_after_send)
+    DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, main_context);
+  g_main_loop_run  (closure.loop);
+
+  g_main_loop_unref (closure.loop);
+  dbus_pending_call_unref (pending);
+  return closure.reply;
+}
+
+static void
+send_test_message (dbus_bool_t switch_after_send)
+{
+  DBusMessage *message, *reply;
+  const char *str;
+  DBusError error;
+
+  dbus_error_init (&error);
+  message = dbus_message_new_method_call ("org.freedesktop.DBus",
+                                          "/org/freedesktop/DBus",
+                                          DBUS_INTERFACE_DBUS, "GetId");
+  reply = send_and_allow_reentry (bus, message, switch_after_send);
+  if (!reply)
+  {
+    fprintf(stderr, "Got no reply from send_and_allow_reentry\n");
+    exit(1);
+  }
+  if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
+  {
+    char *err = NULL;
+    dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
+    fprintf (stderr, "Got error: %s\n", err);
+    exit(1);
+  }
+  if (!dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+  {
+    fprintf(stderr, "Sorry; can't communicate: %s\n", error.message);
+    exit(1);
+  }
+  dbus_message_unref (reply);
+  dbus_message_unref (message);
+}
+
+int
+main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED const char *argv)
+{
+  DBusError error;
+
+  main_context = g_main_context_new ();
+  dbus_error_init (&error);
+  bus = dbus_bus_get_private (DBUS_BUS_SESSION, &error);
+  if (!bus)
+  {
+    fprintf(stderr, "Couldn't connect to bus: %s\n", error.name);
+    return 1;
+  }
+  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (bus, NULL);
+  send_test_message (FALSE);
+  send_test_message (FALSE);
+  send_test_message (TRUE);
+
+  test_run_until_disconnected (bus, NULL);
+  dbus_connection_unref (bus);
+
+  dbus_shutdown ();
+  g_main_context_unref (main_context);
+
+  return 0;
+}

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/meson.build Added

@@ -0,0 +1,66 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+testlib = static_library(
+    'testutils',
+    'util.c',
+    dependencies: 
+        dbus_dep,
+        glib_dep,
+    ,
+)
+
+test_thread_server = executable(
+    'test-thread-server',
+    'test-thread-server.c',
+    dependencies: 
+        dbus_gmain_dep,
+        dbus_dep,
+        glib_dep,
+        gthread_dep,
+    ,
+    link_with: testlib,
+)
+
+test_thread_client = executable(
+    'test-thread-client',
+    'test-thread-client.c',
+    dependencies: 
+        dbus_gmain_dep,
+        dbus_dep,
+        glib_dep,
+        gthread_dep,
+    ,
+    link_with: testlib,
+)
+
+test_cases = '30574'
+
+foreach test_case : test_cases
+    exe = executable(
+        'test-' + test_case,
+        test_case + '.c',
+        dependencies: 
+            dbus_gmain_dep,
+            dbus_dep,
+            glib_dep,
+        ,
+        link_with: testlib,
+    )
+    test(
+        test_case,
+        dbus_run_session,
+        args: 
+            '--',
+            exe,
+        ,
+    )
+endforeach
+
+test(
+    'use-as-subproject',
+    find_program('python3'),
+    args: 
+      files('use-as-subproject.py'),
+    ,
+)

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/test-thread-client.c Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/test-thread-server.c Added

@@ -0,0 +1,235 @@
+/*
+ * Copyright © 2003-2006 Red Hat Inc.
+ * Copyright © 2006-2018 Collabora Ltd.
+ *
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * 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 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <dbus-gmain/dbus-gmain.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "test-thread.h"
+
+typedef struct {
+  guint32 countersN_TEST_THREADS;
+} ThreadTestData;
+
+static ThreadTestData *
+thread_test_data_new (void)
+{
+  ThreadTestData *data;
+
+  data = g_new0 (ThreadTestData, 1);
+  
+  return data;
+}
+
+static void
+thread_test_data_free (ThreadTestData *data)
+{
+  g_free (data);
+}
+
+static DBusHandlerResult
+filter_test_message (DBusConnection     *connection,
+		     DBusMessage        *message,
+		     void               *user_data)
+{
+  ThreadTestData *data = user_data;
+  DBusMessageIter iter;
+  gint32 threadnr;
+  guint32 counter;
+  const char *str;
+  char *expected_str;
+  GString *counter_str;
+  int i;
+
+  if (!dbus_message_is_method_call (message, "org.freedesktop.DBus.GLib.ThreadTest",
+                                    "TestMethod"))
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+  
+  dbus_message_iter_init (message, &iter);
+  
+  if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32)
+    {
+      g_print ("First arg not right type\n");
+      goto out;
+    }
+   dbus_message_iter_get_basic (&iter, &threadnr);
+  if (threadnr < 0 || threadnr >= N_TEST_THREADS)
+    {
+      g_print ("Invalid thread nr\n");
+      goto out;
+    }
+
+  if (! dbus_message_iter_next (&iter))
+    {
+      g_print ("Couldn't get second arg\n");
+      goto out;
+    }
+
+  if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32)
+    {
+      g_print ("Second arg not right type\n");
+      goto out;
+    }
+  
+   dbus_message_iter_get_basic (&iter, &counter);
+
+  if (counter != data->countersthreadnr)
+    {
+      g_print ("Thread %d, counter %d, expected %d\n", threadnr, counter, data->countersthreadnr);
+      goto out;
+    }
+  data->countersthreadnr++;
+  
+  if (! dbus_message_iter_next (&iter))
+    {
+      g_print ("Couldn't get third arg\n");
+      goto out;
+    }
+
+  if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
+    {
+      g_print ("Third arg not right type\n");
+      goto out;
+    }
+
+  dbus_message_iter_get_basic (&iter, &str);
+
+  if (str == NULL)
+    {
+      g_print ("No third arg\n");
+      goto out;
+    }
+
+  expected_str = g_strdup_printf ("Thread %d-%d\n", threadnr, counter);
+  if (strcmp (expected_str, str) != 0)
+    {
+      g_print ("Wrong string '%s', expected '%s'\n", str, expected_str);
+      g_free (expected_str);
+      goto out;
+    }
+  g_free (expected_str);
+
+  if (dbus_message_iter_next (&iter))
+    {
+      g_print ("Extra args on end of message\n");
+      goto out;
+    }
+  
+  dbus_connection_flush (connection);
+
+  counter_str = g_string_new ("");
+  for (i = 0; i < N_TEST_THREADS; i++)
+    {
+      g_string_append_printf (counter_str, "%d ", data->countersi);
+    }
+  g_print ("%s\r", counter_str->str);
+  g_string_free (counter_str, TRUE);
+  
+ out:
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult
+filter_disconnect (DBusConnection     *connection,
+                   DBusMessage        *message,
+                   G_GNUC_UNUSED void *user_data)
+{
+  if (!dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL,
+                               "Disconnected"))
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  g_print ("connection disconnected\n");
+  dbus_connection_unref (connection);
+  
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static void
+new_connection_callback (G_GNUC_UNUSED DBusServer *server,
+                         DBusConnection           *new_connection,
+                         G_GNUC_UNUSED void       *user_data)
+{
+  ThreadTestData * data;
+
+  g_print ("new_connection_callback\n");
+  
+  dbus_connection_ref (new_connection);
+  DBUS_GMAIN_FUNCTION_NAME (set_up_connection) (new_connection, NULL);
+
+  data = thread_test_data_new ();
+  
+  if (!dbus_connection_add_filter (new_connection,
+                                   filter_test_message, data,
+                                   (DBusFreeFunction) thread_test_data_free))
+    goto nomem;
+  
+  if (!dbus_connection_add_filter (new_connection,
+                                   filter_disconnect, NULL, NULL))
+    goto nomem;
+
+  return;
+  
+ nomem:
+  g_error ("no memory to setup new connection");

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/test-thread.h Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/use-as-subproject Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/use-as-subproject.py Added

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+import os
+import shutil
+import subprocess
+import tempfile
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+if __name__ == '__main__':
+    if shutil.which('meson') is None:
+        print('SKIP: meson not found in PATH')
+        raise SystemExit(0)
+
+    with tempfile.TemporaryDirectory() as temp:
+        shutil.copytree(
+            os.path.join(HERE, 'use-as-subproject'),
+            os.path.join(temp, 'src'),
+        )
+        os.makedirs(os.path.join(temp, 'src', 'subprojects'), exist_ok=True)
+        os.symlink(
+            os.path.dirname(HERE),
+            os.path.join(temp, 'src', 'subprojects', 'dbus-gmain'),
+        )
+        subprocess.run(
+            'meson', os.path.join(temp, 'src'), os.path.join(temp, 'build'),
+            check=True,
+        )
+        subprocess.run(
+            'meson', 'compile', '-C', os.path.join(temp, 'build'),
+            check=True,
+        )

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/use-as-subproject/README Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/use-as-subproject/meson.build Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/use-as-subproject/use-dbus-gmain.c Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/util.c Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/subprojects/dbus-gmain/tests/util.h Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/test/compiled.test.in Added

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/cross-test-client.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/cross-test-client.py Changed

@@ -35,24 +35,13 @@
 from dbus import (
     Array, Boolean, Byte, ByteArray, Double, Int16, Int32, Int64,
     Interface, SessionBus, String, UInt16, UInt32, UInt64)
-from dbus._compat import is_py2, is_py3
 import dbus.glib
 
-if is_py2:
-    from dbus import UTF8String
-
 from crosstest import (
     CROSS_TEST_BUS_NAME, CROSS_TEST_PATH, INTERFACE_CALLBACK_TESTS,
     INTERFACE_SIGNAL_TESTS, INTERFACE_SINGLE_TESTS, INTERFACE_TESTS,
     SignalTestsImpl)
 
-if is_py3:
-    def make_long(n):
-        return n
-else:
-    def make_long(n):
-        return long(n)
-
 
 logging.basicConfig()
 logging.getLogger().setLevel(1)
@@ -246,8 +235,6 @@
 
         # Main tests
         self.assert_method_eq(INTERFACE_TESTS, String('foo', variant_level=1), 'Identity', String('foo'))
-        if is_py2:
-            self.assert_method_eq(INTERFACE_TESTS, String('foo', variant_level=1), 'Identity', UTF8String('foo'))
         self.assert_method_eq(INTERFACE_TESTS, Byte(42, variant_level=1), 'Identity', Byte(42))
         self.assert_method_eq(INTERFACE_TESTS, Byte(42, variant_level=23), 'Identity', Byte(42, variant_level=23))
         self.assert_method_eq(INTERFACE_TESTS, Double(42.5, variant_level=1), 'Identity', 42.5)
@@ -271,11 +258,10 @@
         for i in (-0x7fffffff-1, 0, 42, 0x7fffffff):
             self.assert_method_eq(INTERFACE_TESTS, i, 'IdentityInt32', Int32(i))
         for i in (0, 42, 0xffffffff):
-            i = make_long(i)
             self.assert_method_eq(INTERFACE_TESTS, i, 'IdentityUInt32', UInt32(i))
         MANY = 1
         for n in (0x8000, 0x10000, 0x10000, 0x10000):
-            MANY *= make_long(n)
+            MANY *= n
         for i in (-MANY, 0, 42, MANY-1):
             self.assert_method_eq(INTERFACE_TESTS, i, 'IdentityInt64', Int64(i))
         for i in (0, 42, 2*MANY - 1):

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/cross-test-server.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/cross-test-server.py Changed

@@ -35,7 +35,6 @@
 import dbus.glib
 from dbus import SessionBus
 from dbus.service import BusName
-from dbus._compat import is_py2
 
 from crosstest import (
     CROSS_TEST_BUS_NAME, CROSS_TEST_PATH, INTERFACE_CALLBACK_TESTS,
@@ -226,12 +225,7 @@
         logger.info('Sum of %r is %r', input, x)
         return x
 
-
-    kwargs = {}
-    if is_py2:
-        kwargs'utf8_strings' = True
-
-    @dbus.service.method(INTERFACE_TESTS, 'a{ss}', 'a{sas}', **kwargs)
+    @dbus.service.method(INTERFACE_TESTS, 'a{ss}', 'a{sas}')
     def InvertMapping(self, input):
         tested_things.add(INTERFACE_TESTS + '.InvertMapping')
         output = dbus.Dictionary({})
@@ -276,8 +270,7 @@
 
     @dbus.service.method(INTERFACE_TESTS, 'st', '',
                          connection_keyword='conn',
-                         async_callbacks=('reply_cb', 'error_cb'),
-                         **kwargs)
+                         async_callbacks=('reply_cb', 'error_cb'))
     def Trigger(self, object, parameter, conn=None, reply_cb=None,
                 error_cb=None):
         assert isinstance(object, str)
@@ -328,17 +321,13 @@
     loop = GLib.MainLoop()
     obj = Server(bus_name, CROSS_TEST_PATH, loop.quit)
     objectsCROSS_TEST_PATH = obj
-    kwargs = {}
-    if is_py2:
-        kwargs'utf8_strings' = True
     bus.add_signal_receiver(obj.triggered_by_client,
                             signal_name='Trigger',
                             dbus_interface=INTERFACE_SIGNAL_TESTS,
                             named_service=None,
                             path=None,
                             sender_keyword='sender',
-                            path_keyword='sender_path',
-                            **kwargs)
+                            path_keyword='sender_path')
 
     logger.info("running...")
     loop.run()

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/dbus_py_test.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/dbus_py_test.c Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/import-repeatedly.c -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/import-repeatedly.c Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/test/installable Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/test/installable/meson.build Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/test/meson.build Added

@@ -0,0 +1,191 @@
+# Copyright 2022 Collabora Ltd.
+# SPDX-License-Identifier: MIT
+
+installed_testdir = get_option('libexecdir') / 'installed-tests' / meson.project_name() / get_option('installed_tests_subdir')
+installed_test_testdir = installed_testdir / 'test'
+installed_test_metadir = get_option('datadir') / 'installed-tests' / meson.project_name() / get_option('installed_tests_subdir')
+test_env = environment()
+test_env.set('DBUS_TOP_SRCDIR', meson.project_source_root())
+test_env.set('DBUS_TOP_BUILDDIR', meson.project_build_root())
+test_env.set('DBUS_TEST_TMPDIR', meson.project_build_root() / 'test')
+test_env.set('DBUS_TEST_UNINSTALLED', '1')
+test_env.set('DBUS_PYTHON_VERSION', meson.project_version())
+test_env.set('PYTHON', py.full_path())
+test_env.set('DBUS_FATAL_WARNINGS', '1')
+test_env.set(
+    'PYTHONPATH',
+    ':'.join(
+        meson.project_source_root(),
+        meson.project_source_root() / 'test',
+        meson.project_build_root(),
+        meson.project_build_root() / 'test',
+    )
+)
+
+dbus_py_test = py.extension_module(
+    'dbus_py_test',
+    sources: 
+        'dbus_py_test.c',
+    ,
+    dependencies: 
+        dbus_dep,
+        py.dependency(),
+    ,
+    include_directories: project_include_directories,
+    install: get_option('installed_tests'),
+    install_dir: installed_test_testdir,
+)
+
+build_time_test_config = {
+    'PYTHON': py.full_path(),
+    'G_TEST_SRCDIR': meson.project_source_root(),
+    'G_TEST_BUILDDIR': meson.project_build_root(),
+    'configure_input': 'Generated by build system, do not edit',
+}
+
+configure_file(
+    input: 'TestSuitePythonService.service.in',
+    output: 'TestSuitePythonService.service',
+    configuration: build_time_test_config,
+)
+
+tmp_session_bus_conf = configure_file(
+    input: 'tmp-session-bus.conf.in',
+    output: 'tmp-session-bus.conf',
+    configuration: build_time_test_config,
+)
+
+if get_option('installed_tests')
+    subdir('installable')
+
+    install_data(
+        'cross-test-client.py',
+        'cross-test-server.py',
+        'crosstest.py',
+        'dbus_test_utils.py',
+        'test-service.py',
+        'wait-for-name.py',
+        install_dir: installed_test_testdir,
+    )
+endif
+
+dbus_run_session = find_program('dbus-run-session', required: true)
+
+build_time_dbus_run_session_args = 
+    '--config-file=@0@'.format(tmp_session_bus_conf),
+    '--',
+
+
+installed_wrapper = 
+    dbus_run_session.full_path(),
+    '--config-file=@0@'.format(
+        get_option('prefix') / installed_test_testdir / 'tmp-session-bus.conf'
+    ),
+    '--',
+    'env',
+    'PYTHON=' + py.full_path(),
+    'DBUS_TOP_SRCDIR=' + (get_option('prefix') / installed_testdir),
+    'DBUS_TOP_BUILDDIR=' + (get_option('prefix') / installed_testdir),
+
+
+compiled_test_cases = 'import-repeatedly'
+
+foreach test_case : compiled_test_cases
+    exe = executable(
+        'test-' + test_case,
+        test_case + '.c',
+        dependencies: 
+            py.dependency(embed: true),
+        ,
+        install: get_option('installed_tests'),
+        install_dir: installed_test_testdir,
+    )
+    test(
+        test_case,
+        dbus_run_session,
+        args: build_time_dbus_run_session_args + exe,
+        env: test_env,
+    )
+
+    if get_option('installed_tests')
+        configure_file(
+            input: 'compiled.test.in',
+            output: 'test-' + test_case + '.test',
+            configuration: {
+                'wrapper': ' '.join(installed_wrapper),
+                'program': get_option('prefix') / installed_test_testdir / 'test-' + test_case,
+            },
+            install: true,
+            install_dir: installed_test_metadir,
+        )
+    endif
+endforeach
+
+py_test_cases = 
+    'client',
+    'exception-py3',
+    'p2p',
+    'signals',
+    'standalone',
+    'unusable-main-loop',
+
+install_test_sources = 
+
+foreach test_case : py_test_cases
+    install_test_sources += 'test-@0@.py'.format(test_case)
+    test(
+        test_case,
+        dbus_run_session,
+        args: build_time_dbus_run_session_args + 
+            py.full_path(),
+            files('test-' + test_case + '.py'),
+        ,
+        env: test_env,
+    )
+
+    if get_option('installed_tests')
+        configure_file(
+            input: 'py.test.in',
+            output: 'test-' + test_case + '.py.test',
+            configuration: {
+                'wrapper': ' '.join(installed_wrapper),
+                'python': py.full_path(),
+                'program': get_option('prefix') / installed_test_testdir / 'test-' + test_case + '.py',
+            },
+            install: true,
+            install_dir: installed_test_metadir,
+        )
+    endif
+endforeach
+
+sh_test_cases = 'run-test'
+
+foreach test_case : sh_test_cases
+    install_test_sources += '@0@.sh'.format(test_case)
+    test(
+        test_case + '.sh',
+        dbus_run_session,
+        args: build_time_dbus_run_session_args + files(test_case + '.sh'),
+        env: test_env,
+    )
+
+    if get_option('installed_tests')
+        configure_file(
+            input: 'sh.test.in',
+            output: test_case + '.sh.test',
+            configuration: {
+                'wrapper': ' '.join(installed_wrapper),
+                'program': get_option('prefix') / installed_test_testdir / test_case + '.sh',
+            },
+            install: true,
+            install_dir: installed_test_metadir,
+        )
+    endif
+endforeach
+
+if get_option('installed_tests')
+    install_data(
+        install_test_sources,
+        install_dir: installed_test_testdir,
+    )
+endif

_service:tar_scm:dbus-python-1.3.2.tar.gz/test/py.test.in Added

_service:tar_scm:dbus-python-1.3.2.tar.gz/test/sh.test.in Added

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-client.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/test-client.py Changed

@@ -31,6 +31,7 @@
 import time
 import logging
 import weakref
+import sys
 
 import dbus
 import _dbus_bindings
@@ -39,10 +40,8 @@
 import dbus.service
 import dbus_test_utils
 
-from dbus._compat import is_py2, is_py3
-
 try:
-    from gi.repository import GLib
+    from gi.repository import GLib, Gio
 except ImportError:
     print('1..0 # SKIP cannot import GLib')
     raise SystemExit(0)
@@ -128,16 +127,9 @@
         self.assertEqual(self.iface.AcceptListOfByte(b'\1\2\3', byte_arrays=True), b'\1\2\3')
         self.assertEqual(self.iface.AcceptByteArray(b'\1\2\3'), 1,2,3)
         self.assertEqual(self.iface.AcceptByteArray(b'\1\2\3', byte_arrays=True), b'\1\2\3')
-        if is_py2:
-            self.assertTrue(isinstance(self.iface.AcceptUTF8String('abc'), unicode))
-            self.assertTrue(isinstance(self.iface.AcceptUTF8String('abc', utf8_strings=True), str))
-        unicode_type = (str if is_py3 else unicode)
         self.assertTrue(isinstance(self.iface.AcceptUnicodeString('abc'), 
-                                   unicode_type))
-        kwargs = {}
-        if is_py2:
-            kwargs'utf8_strings' = True
-        self.assertTrue(isinstance(self.iface.AcceptUnicodeString('abc', **kwargs), str))
+                                   str))
+        self.assertTrue(isinstance(self.iface.AcceptUnicodeString('abc'), str))
 
     def testIntrospection(self):
         #test introspection
@@ -179,17 +171,6 @@
         self.assertTrue(destination.startswith(':'))
         self.assertEqual(message_cls, 'dbus.lowlevel.MethodCallMessage')
 
-    def testUtf8StringsSync(self):
-        if is_py3:
-            return
-        send_val = 'foo'
-        recv_val = self.iface.Echo(send_val, utf8_strings=True)
-        self.assertTrue(isinstance(recv_val, str))
-        self.assertTrue(isinstance(recv_val, dbus.UTF8String))
-        recv_val = self.iface.Echo(send_val, utf8_strings=False)
-        self.assertTrue(isinstance(recv_val, unicode))
-        self.assertTrue(isinstance(recv_val, dbus.String))
-
     def testBenchmarkIntrospect(self):
         print("\n********* Benchmark Introspect ************")
         a = time.time()
@@ -200,11 +181,16 @@
         print("Delta: %f" % (b - a))
         self.assertTrue(True)
 
+    def testAllowInteractiveAuthorization(self):
+        message = dbus.lowlevel.MethodCallMessage(NAME, OBJECT, IFACE, 'TestAllowInteractiveAuthorization')
+        assert not message.get_allow_interactive_authorization()
+        message.set_allow_interactive_authorization(True)
+        assert message.get_allow_interactive_authorization()
+
     def testNoReply(self):
         failures = 
         report = 
         main_loop = GLib.MainLoop()
-        unicode_type = (str if is_py3 else unicode)
 
         def message_filter(conn, m):
             print('Message filter received message: %r, %r' % (m, m.get_args_list()))
@@ -213,7 +199,7 @@
                 failures.append('Message filter called on unexpected bus')
 
             for a in m.get_args_list():
-                if isinstance(a, unicode_type):
+                if isinstance(a, str):
                     if SHOULD_NOT_HAPPEN in a:
                         failures.append('Had an unexpected reply')
                     elif a == 'TestNoReply report':
@@ -263,9 +249,7 @@
                 self.expected_result = expected_result
                 self.do_exit = do_exit
                 self.test_controler = test_controler
-                if is_py2:
-                    self.utf8 = kwargs'utf8'
-                elif 'utf8' in kwargs:
+                if 'utf8' in kwargs:
                     raise TypeError("unexpected keyword argument 'utf8'")
 
             def callback(self, val):
@@ -275,13 +259,6 @@
 
                     self.test_controler.assertEqual(val, self.expected_result)
                     self.test_controler.assertEqual(val.variant_level, 1)
-                    if is_py2:
-                        if self.utf8 and not isinstance(val, dbus.UTF8String):
-                            failures.append('%r should have been utf8 but was not' % val)
-                            return
-                        elif not self.utf8 and isinstance(val, dbus.UTF8String):
-                            failures.append('%r should not have been utf8' % val)
-                            return
                 except Exception as e:
                     failures.append("%s:\n%s" % (e.__class__, e))
 
@@ -295,17 +272,10 @@
         last_type = test_types_vals-1
         for send_val in test_types_vals:
             print("Testing %s" % str(send_val))
-            kwargs = {}
-            if is_py2:
-                utf8 = (send_val == 'gob@gob.com')
-                kwargs'utf8' = utf8
-                kwargs'utf8_strings' = utf8
-            check = async_check(self, send_val, last_type == send_val,
-                                **kwargs)
+            check = async_check(self, send_val, last_type == send_val)
             recv_val = self.iface.Echo(send_val,
                                        reply_handler=check.callback,
-                                       error_handler=check.error_handler,
-                                       **kwargs)
+                                       error_handler=check.error_handler)
         main_loop.run()
         if failures:
             self.assertTrue(False, failures)
@@ -649,6 +619,59 @@
         else:
             raise AssertionError('Wanted an exception')
 
+    @unittest.skipIf(sys.platform.startswith("win"), "requires Unix")
+    def test_invalid_fd_index(self) -> None:
+        # libdbus cannot call a method containing fd indexes that are
+        # out-of-range for the number of fds attached to the message,
+        # but Gio can.
+        gdbus_conn = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+
+        try:
+            results, fds = gdbus_conn.call_with_unix_fd_list_sync(
+                NAME, OBJECT, IFACE, 'EchoVariant',
+                GLib.Variant('(v)', (GLib.Variant.new_handle(42),)),
+                GLib.VariantType('(v)'),
+                Gio.DBusCallFlags.NONE,
+                -1,
+                Gio.UnixFDList.new(),
+                None,
+            )
+        except GLib.GError as e:
+            self.assertEqual(
+                Gio.dbus_error_get_remote_error(e),
+                'org.freedesktop.DBus.Python.ValueError',
+            )
+            self.assertIn(
+                'invalid file descriptor in message', str(e),
+            )
+        else:
+            raise AssertionError('Wanted an exception')
+
+        plain_fd = os.open('/dev/null', os.O_RDONLY)
+        expected_stat = os.fstat(plain_fd)
+
+        try:
+            # Check that the server can do a similar operation with valid
+            # fds, and has not crashed
+            for i in range(2):
+                fds_in = Gio.UnixFDList.new()
+                self.assertEqual(fds_in.append(plain_fd), 0)
+                results, fds_out = gdbus_conn.call_with_unix_fd_list_sync(
+                    NAME, OBJECT, IFACE, 'EchoVariant',
+                    GLib.Variant('(v)', (GLib.Variant.new_handle(0),)),
+                    GLib.VariantType('(v)'),
+                    Gio.DBusCallFlags.NONE,
+                    -1,
+                    fds_in,
+                    None,
+                )
+                self.assertEqual(results0, 0)
+                fd = fds_out.peek_fds()0
+                actual_stat = os.fstat(fd)
+                self.assertEqual(expected_stat, actual_stat)
+        finally:
+            os.close(plain_fd)
+
 """ Remove this for now
 class TestDBusPythonToGLibBindings(unittest.TestCase):
     def setUp(self):

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-exception-py3.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/test-exception-py3.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-p2p.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/test-p2p.py Changed

@@ -37,8 +37,6 @@
 import dbus.types
 import dbus_test_utils
 
-from dbus._compat import is_py2
-
 try:
     from gi.repository import GLib
 except ImportError:
@@ -62,15 +60,10 @@
         # using dbus.bus.BusConnection!
         conn = dbus.connection.Connection(
                 os.environ'DBUS_SESSION_BUS_ADDRESS')
-        kwargs = {}
-        if is_py2:
-            kwargs'utf8_strings' = True
         unique = conn.call_blocking('org.freedesktop.DBus',
                                     '/org/freedesktop/DBus',
                                     'org.freedesktop.DBus', 'Hello',
-                                    '', (), **kwargs)
-        if is_py2:
-            self.assertTrue(unique.__class__ == dbus.UTF8String, repr(unique))
+                                    '', ())
         self.assertTrue(unique.startswith(':'), unique)
         conn.set_unique_name(unique)
         return conn, unique
@@ -112,12 +105,8 @@
 
     def testSetUniqueName(self):
         conn, unique = self.get_conn_and_unique()
-        kwargs = {}
-        if is_py2:
-            kwargs'utf8_strings' = True
         ret = conn.call_blocking(NAME, OBJECT, IFACE,
-                                 'MethodExtraInfoKeywords', '', (),
-                                 **kwargs)
+                                 'MethodExtraInfoKeywords', '', ())
         self.assertEqual(ret, (unique, OBJECT, NAME,
                                 'dbus.lowlevel.MethodCallMessage'))

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-service.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/test-service.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-signals.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/test-signals.py Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/test/test-standalone.py -> _service:tar_scm:dbus-python-1.3.2.tar.gz/test/test-standalone.py Changed

@@ -30,6 +30,7 @@
 
 from __future__ import unicode_literals
 
+import logging
 import struct
 import sys
 import os
@@ -40,18 +41,12 @@
 import dbus.lowlevel as lowlevel
 import dbus.types as types
 import dbus_test_utils
-from dbus._compat import is_py2, is_py3
 
-if is_py3:
-    def make_long(n):
-        return n
 
-    UNICODE = str
-else:
-    def make_long(n):
-        return long(n)
+logging.basicConfig()
+logging.getLogger().setLevel(1)
+logger = logging.getLogger('test-standalone')
 
-    UNICODE = unicode
 
 if 'DBUS_TEST_UNINSTALLED' in os.environ:
     builddir = os.path.normpath(os.environ"DBUS_TOP_BUILDDIR")
@@ -77,6 +72,9 @@
         'a different major version'\
         % (_dbus_bindings._python_version, sys.hexversion)
 
+logger.info('dbus found at %r', dbus.__file__)
+logger.info('_dbus_bindings found at %r', _dbus_bindings.__file__)
+
 def uni(x):
     """Return a Unicode string consisting of the single Unicode character
     with the given codepoint (represented as a surrogate pair if this is
@@ -86,10 +84,7 @@
     supported.
     """
     if x <= 0xFFFF:
-        if is_py3:
-            return chr(x)
-        else:
-            return unichr(x)
+        return chr(x)
     else:
         return struct.pack('>I', x).decode('utf_32_be')
 
@@ -125,7 +120,6 @@
         self.assertEqual(types.Byte(b'x', variant_level=2),
                           types.Byte(ord('x')))
         self.assertEqual(types.Byte(1), 1)
-        self.assertEqual(types.Byte(make_long(1)), 1)
         self.assertRaises(Exception, lambda: types.Byte(b'ab'))
         self.assertRaises(TypeError, types.Byte, '\x12xxxxxxxxxxxxx')
         self.assertEqual(str(types.Byte(b'x')), 'x')
@@ -145,8 +139,6 @@
 
     def test_integers(self):
         subclasses = int
-        if is_py2:
-            subclasses.append(long)
         subclasses = tuple(subclasses)
         # This is an API guarantee. Note that exactly which of these types
         # are ints and which of them are longs is *not* guaranteed.
@@ -162,12 +154,6 @@
             self.assertEqual(str(cls(42)), '42')
             self.assertIs(type(str(cls(42))), str)
 
-            if is_py2:
-                self.assertEqual(long(cls(42)), make_long(42))
-                self.assertIs(type(long(cls(42))), long)
-                self.assertEqual(unicode(cls(42)), '42'.decode('ascii'))
-                self.assertIs(type(unicode(cls(42))), unicode)
-
     def test_integer_limits_16(self):
         self.assertEqual(types.Int16(0x7fff), 0x7fff)
         self.assertEqual(types.Int16(-0x8000), -0x8000)
@@ -178,27 +164,22 @@
 
     def test_integer_limits_32(self):
         self.assertEqual(types.Int32(0x7fffffff), 0x7fffffff)
-        self.assertEqual(types.Int32(make_long(-0x80000000)), 
-                         make_long(-0x80000000))
-        self.assertEqual(types.UInt32(make_long(0xffffffff)), 
-                         make_long(0xffffffff))
-        self.assertRaises(Exception, types.Int32, make_long(0x80000000))
-        self.assertRaises(Exception, types.Int32, make_long(-0x80000001))
-        self.assertRaises(Exception, types.UInt32, make_long(0x100000000))
+        self.assertEqual(types.Int32(-0x80000000), -0x80000000)
+        self.assertEqual(types.UInt32(0xffffffff), 0xffffffff)
+        self.assertRaises(Exception, types.Int32, 0x80000000)
+        self.assertRaises(Exception, types.Int32, -0x80000001)
+        self.assertRaises(Exception, types.UInt32, 0x100000000)
 
     def test_integer_limits_64(self):
-        self.assertEqual(types.Int64(make_long(0x7fffffffffffffff)), 
-                         make_long(0x7fffffffffffffff))
-        self.assertEqual(types.Int64(make_long(-0x8000000000000000)), 
-                         make_long(-0x8000000000000000))
-        self.assertEqual(types.UInt64(make_long(0xffffffffffffffff)), 
-                         make_long(0xffffffffffffffff))
-        self.assertRaises(Exception, types.Int64,
-                          make_long(0x8000000000000000))
-        self.assertRaises(Exception, types.Int64,
-                          make_long(-0x8000000000000001))
-        self.assertRaises(Exception, types.UInt64,
-                          make_long(0x10000000000000000))
+        self.assertEqual(types.Int64(0x7fffffffffffffff),
+                         0x7fffffffffffffff)
+        self.assertEqual(types.Int64(-0x8000000000000000),
+                         -0x8000000000000000)
+        self.assertEqual(types.UInt64(0xffffffffffffffff),
+                         0xffffffffffffffff)
+        self.assertRaises(Exception, types.Int64, 0x8000000000000000)
+        self.assertRaises(Exception, types.Int64, -0x8000000000000001)
+        self.assertRaises(Exception, types.UInt64, 0x10000000000000000)
 
     def test_Signature(self):
         self.assertRaises(Exception, types.Signature, 'a')
@@ -211,31 +192,13 @@
         self.assertEqual(str(types.Signature('ab')), 'ab')
         self.assertIs(type(str(types.Signature('ab'))), str)
 
-        if is_py2:
-            self.assertEqual(str(types.Signature('ab')), 'ab')
-            self.assertIs(type(str(types.Signature('ab'))), str)
-            self.assertEqual(unicode(types.Signature('ab')), 'ab'.decode('ascii'))
-            self.assertIs(type(unicode(types.Signature('ab'))), unicode)
-
     def test_string(self):
         self.assertEqual(types.String('hello', variant_level=23), 'hello')
         self.assertEqual(types.String('hello', variant_level=23).variant_level, 23)
-        self.assertTrue(isinstance(types.String('hello'), UNICODE))
+        self.assertTrue(isinstance(types.String('hello'), str))
         self.assertEqual(str(types.String('hello')), 'hello')
         self.assertIs(type(str(types.String('hello'))), str)
 
-        if is_py2:
-            self.assertEqual(unicode(types.String('hello')), 'hello'.decode('ascii'))
-            self.assertIs(type(unicode(types.String('hello'))), unicode)
-
-            self.assertEqual(types.UTF8String('hello', variant_level=23), 'hello')
-            self.assertEqual(types.UTF8String('hello', variant_level=23).variant_level, 23)
-            self.assertTrue(isinstance(types.UTF8String('hello'), str))
-            self.assertEqual(str(types.UTF8String('hello')), 'hello')
-            self.assertIs(type(str(types.UTF8String('hello'))), str)
-            self.assertEqual(unicode(types.UTF8String('hello')), 'hello'.decode('ascii'))
-            self.assertIs(type(unicode(types.UTF8String('hello'))), unicode)
-
     def test_object_path(self):
         self.assertRaises(Exception, types.ObjectPath, 'a')
         self.assertEqual(types.ObjectPath('/ab', variant_level=23), '/ab')
@@ -244,10 +207,6 @@
         self.assertEqual(str(types.ObjectPath('/ab')), '/ab')
         self.assertIs(type(str(types.ObjectPath('/ab'))), str)
 
-        if is_py2:
-            self.assertEqual(unicode(types.ObjectPath('/ab')), '/ab'.decode('ascii'))
-            self.assertIs(type(unicode(types.ObjectPath('/ab'))), unicode)
-
     def test_boolean(self):
         self.assertEqual(types.Boolean(True, variant_level=23), True)
         self.assertEqual(types.Boolean(True, variant_level=23).variant_level, 23)
@@ -260,10 +219,6 @@
         self.assertIs(type(int(types.Boolean(False))), int)
         self.assertIs(type(int(types.Boolean(True))), int)
 
-        if is_py2:
-            self.assertEqual(unicode(types.Boolean(True)), '1'.decode('ascii'))
-            self.assertIs(type(unicode(types.Boolean(True))), unicode)
-
 
 class TestMessageMarshalling(unittest.TestCase):
 
@@ -427,8 +382,6 @@
         aeq = self.assertEqual
         from _dbus_bindings import Message
         aeq(Message.guess_signature(7), 'i')
-        if is_py2:
-            aeq(Message.guess_signature(make_long(7)), 'x')
 
     def test_guess_signature_dbus_types(self):
         aeq = self.assertEqual
@@ -465,31 +418,20 @@
         aeq(byte.__class__, types.Byte)
         aeq(bytes.__class__, types.ByteArray)
         aeq(bytes, b'bytes')
-        if is_py3:
-            aeq(bytes0.__class__, int)
-        else:
-            aeq(bytes0.__class__, str)
+        aeq(bytes0.__class__, int)
         aeq(int32.__class__, types.Int32)
         aeq(uint32.__class__, types.UInt32)
         aeq(string.__class__, types.String)

_service:tar_scm:dbus-python-1.2.18.tar.gz/tools/check-c-style.sh -> _service:tar_scm:dbus-python-1.3.2.tar.gz/tools/check-c-style.sh Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/tools/check-coding-style.mk -> _service:tar_scm:dbus-python-1.3.2.tar.gz/tools/check-coding-style.mk Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/tools/check-py-style.sh -> _service:tar_scm:dbus-python-1.3.2.tar.gz/tools/check-py-style.sh Changed

_service:tar_scm:dbus-python-1.2.18.tar.gz/tools/check-whitespace.sh -> _service:tar_scm:dbus-python-1.3.2.tar.gz/tools/check-whitespace.sh Changed

_service:tar_scm:dbus-python-1.3.2.tar.gz/tools/generate-pkginfo.py Added

Changes of Revision 2