diff -Nru logilab-common-1.4.1/debian/changelog logilab-common-1.4.2/debian/changelog --- logilab-common-1.4.1/debian/changelog 2017-12-08 00:00:57.000000000 +0000 +++ logilab-common-1.4.2/debian/changelog 2018-12-15 20:45:29.000000000 +0000 @@ -1,3 +1,20 @@ +logilab-common (1.4.2-1) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Set Vcs-* to salsa.debian.org + * d/copyright: Use https protocol in Format field + * d/control: Remove ancient X-Python3-Version field + * Convert git repository from git-dpm to gbp layout + + [ Sandro Tosi ] + * New upstream release + * debian/copyright + - extend packaging copyright years + * debian/control + - bump Standards-Version to 4.2.1 (no changes needed) + + -- Sandro Tosi Sat, 15 Dec 2018 15:45:29 -0500 + logilab-common (1.4.1-1) unstable; urgency=medium * New upstream release diff -Nru logilab-common-1.4.1/debian/control logilab-common-1.4.2/debian/control --- logilab-common-1.4.1/debian/control 2017-12-08 00:00:57.000000000 +0000 +++ logilab-common-1.4.2/debian/control 2018-12-15 20:45:29.000000000 +0000 @@ -6,11 +6,10 @@ Build-Depends: debhelper (>= 7.0.50~), python (>= 2.5.3-1~), python3-all, python-setuptools, python3-setuptools Build-Depends-Indep: dh-python, python-epydoc, graphviz, python-egenix-mxdatetime, python-unittest2, python-six, python3-six, python-tz, python3-tz XS-Python-Version: all -X-Python3-Version: >= 3.2 -Standards-Version: 4.1.2 +Standards-Version: 4.2.1 Homepage: https://www.logilab.org/project/logilab-common -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/logilab-common.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/logilab-common.git +Vcs-Git: https://salsa.debian.org/python-team/modules/logilab-common.git +Vcs-Browser: https://salsa.debian.org/python-team/modules/logilab-common Package: python-logilab-common Architecture: all diff -Nru logilab-common-1.4.1/debian/copyright logilab-common-1.4.2/debian/copyright --- logilab-common-1.4.1/debian/copyright 2017-12-08 00:00:57.000000000 +0000 +++ logilab-common-1.4.2/debian/copyright 2018-12-15 20:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: logilab-common Source: https://www.logilab.org/project/logilab-common @@ -13,5 +13,5 @@ Version 2.1 may be found in '/usr/share/common-licenses/LGPL-2.1'. Files: debian/* -Copyright: Copyright (C) 2008-2016, Sandro Tosi +Copyright: Copyright (C) 2008-2018, Sandro Tosi License: LGPL-2.1 diff -Nru logilab-common-1.4.1/debian/.git-dpm logilab-common-1.4.2/debian/.git-dpm --- logilab-common-1.4.1/debian/.git-dpm 2017-12-08 00:00:57.000000000 +0000 +++ logilab-common-1.4.2/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# see git-dpm(1) from git-dpm package -fc5466c02e2d282cc0f7996383afcc996f04fb64 -fc5466c02e2d282cc0f7996383afcc996f04fb64 -fc5466c02e2d282cc0f7996383afcc996f04fb64 -fc5466c02e2d282cc0f7996383afcc996f04fb64 -logilab-common_1.4.1.orig.tar.gz -750140830e6a93e18c18efe269ed09bd7e6255c5 -185150 -debianTag="debian/%e%v" -patchedTag="patched/%e%v" -upstreamTag="upstream/%e%u" diff -Nru logilab-common-1.4.1/logilab/common/decorators.py logilab-common-1.4.2/logilab/common/decorators.py --- logilab-common-1.4.1/logilab/common/decorators.py 2016-01-25 13:22:33.000000000 +0000 +++ logilab-common-1.4.2/logilab/common/decorators.py 2018-07-06 12:53:43.000000000 +0000 @@ -24,7 +24,14 @@ import sys import types from time import clock, time -from inspect import isgeneratorfunction, getargspec +from inspect import isgeneratorfunction + +import six + +if six.PY3: + from inspect import getfullargspec +else: + from inspect import getargspec as getfullargspec from logilab.common.compat import method_type @@ -37,7 +44,7 @@ def __call__(self, callableobj=None): assert not isgeneratorfunction(callableobj), \ 'cannot cache generator function: %s' % callableobj - if len(getargspec(callableobj).args) == 1 or self.keyarg == 0: + if len(getfullargspec(callableobj).args) == 1 or self.keyarg == 0: cache = _SingleValueCache(callableobj, self.cacheattr) elif self.keyarg: cache = _MultiValuesKeyArgCache(callableobj, self.keyarg, self.cacheattr) diff -Nru logilab-common-1.4.1/logilab_common.egg-info/PKG-INFO logilab-common-1.4.2/logilab_common.egg-info/PKG-INFO --- logilab-common-1.4.1/logilab_common.egg-info/PKG-INFO 2017-07-11 11:49:55.000000000 +0000 +++ logilab-common-1.4.2/logilab_common.egg-info/PKG-INFO 2018-07-06 12:55:59.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: logilab-common -Version: 1.4.1 +Version: 1.4.2 Summary: collection of low-level Python packages and modules used by Logilab projects Home-page: http://www.logilab.org/project/logilab-common Author: Logilab diff -Nru logilab-common-1.4.1/logilab_common.egg-info/requires.txt logilab-common-1.4.2/logilab_common.egg-info/requires.txt --- logilab-common-1.4.1/logilab_common.egg-info/requires.txt 2017-07-11 11:49:55.000000000 +0000 +++ logilab-common-1.4.2/logilab_common.egg-info/requires.txt 2018-07-06 12:55:59.000000000 +0000 @@ -1,2 +1,2 @@ setuptools -six >= 1.4.0 +six>=1.4.0 diff -Nru logilab-common-1.4.1/PKG-INFO logilab-common-1.4.2/PKG-INFO --- logilab-common-1.4.1/PKG-INFO 2017-07-11 11:49:56.000000000 +0000 +++ logilab-common-1.4.2/PKG-INFO 2018-07-06 12:55:59.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: logilab-common -Version: 1.4.1 +Version: 1.4.2 Summary: collection of low-level Python packages and modules used by Logilab projects Home-page: http://www.logilab.org/project/logilab-common Author: Logilab diff -Nru logilab-common-1.4.1/__pkginfo__.py logilab-common-1.4.2/__pkginfo__.py --- logilab-common-1.4.1/__pkginfo__.py 2017-07-11 11:17:06.000000000 +0000 +++ logilab-common-1.4.2/__pkginfo__.py 2018-07-06 12:54:13.000000000 +0000 @@ -25,7 +25,7 @@ subpackage_of = 'logilab' subpackage_master = True -numversion = (1, 4, 1) +numversion = (1, 4, 2) version = '.'.join([str(num) for num in numversion]) license = 'LGPL' # 2.1 or later diff -Nru logilab-common-1.4.1/setup.cfg logilab-common-1.4.2/setup.cfg --- logilab-common-1.4.1/setup.cfg 2017-07-11 11:49:56.000000000 +0000 +++ logilab-common-1.4.2/setup.cfg 2018-07-06 12:55:59.000000000 +0000 @@ -5,5 +5,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0