diff -Nru usagestats-1.0/contrib/wsgi_server.py usagestats-1.0.1/contrib/wsgi_server.py --- usagestats-1.0/contrib/wsgi_server.py 2020-04-23 16:37:15.000000000 +0000 +++ usagestats-1.0.1/contrib/wsgi_server.py 2021-07-05 07:04:13.000000000 +0000 @@ -28,7 +28,7 @@ break msecs += 1 - lines = [l for l in report.split(b'\n') if l] + lines = [line for line in report.split(b'\n') if line] for line in lines: if line.startswith(b'date:'): date = line[5:] diff -Nru usagestats-1.0/debian/changelog usagestats-1.0.1/debian/changelog --- usagestats-1.0/debian/changelog 2020-04-23 16:42:06.000000000 +0000 +++ usagestats-1.0.1/debian/changelog 2021-07-05 07:01:43.000000000 +0000 @@ -1,3 +1,13 @@ +usagestats (1.0.1-1) unstable; urgency=medium + + * New upstream release + * Rename branches to DEP-14; point vs-git to -b debian/latest + * Add d/gbp.conf pointing to DEP-14 branchesĀ§ + * Standards-Version: 4.5.1 + * Debhelper level 13 + + -- Alastair McKinstry Mon, 05 Jul 2021 08:01:43 +0100 + usagestats (1.0-1) unstable; urgency=medium * New upstream release diff -Nru usagestats-1.0/debian/control usagestats-1.0.1/debian/control --- usagestats-1.0/debian/control 2020-04-23 16:42:06.000000000 +0000 +++ usagestats-1.0.1/debian/control 2021-07-05 07:01:43.000000000 +0000 @@ -2,13 +2,13 @@ Section: python Priority: optional Maintainer: Alastair McKinstry -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper (>= 13), dh-sequence-python3, python3-all, python3-setuptools -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Homepage: http://pypi.python.org/pypi/usagestats -Vcs-Git: https://salsa.debian.org/python-team/modules/usagestats.git +Vcs-Git: https://salsa.debian.org/python-team/modules/usagestats.git -b debian/latest Vcs-Browser: https://salsa.debian.org/python-team/modules/usagestats Package: python3-usagestats diff -Nru usagestats-1.0/debian/gbp.conf usagestats-1.0.1/debian/gbp.conf --- usagestats-1.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ usagestats-1.0.1/debian/gbp.conf 2021-07-05 07:01:43.000000000 +0000 @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is "upstream". +# Change it if the name is different (for instance, "master"). +upstream-branch = upstream/latest + +# The default name for the Debian branch is "master". +# Change it if the name is different (for instance, "debian/unstable"). +debian-branch = debian/latest + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = False diff -Nru usagestats-1.0/PKG-INFO usagestats-1.0.1/PKG-INFO --- usagestats-1.0/PKG-INFO 2020-04-23 16:37:15.000000000 +0000 +++ usagestats-1.0.1/PKG-INFO 2021-07-05 07:04:13.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: usagestats -Version: 1.0 +Version: 1.0.1 Summary: Anonymous usage statistics collector Home-page: https://github.com/remram44/usagestats Author: Remi Rampin diff -Nru usagestats-1.0/setup.py usagestats-1.0.1/setup.py --- usagestats-1.0/setup.py 2020-04-23 16:37:15.000000000 +0000 +++ usagestats-1.0.1/setup.py 2021-07-05 07:04:13.000000000 +0000 @@ -9,7 +9,7 @@ with open('README.rst') as fp: description = fp.read() setup(name='usagestats', - version='1.0', + version='1.0.1', py_modules=['usagestats'], description="Anonymous usage statistics collector", install_requires=['requests', 'distro'], diff -Nru usagestats-1.0/usagestats.py usagestats-1.0.1/usagestats.py --- usagestats-1.0/usagestats.py 2020-04-23 16:37:15.000000000 +0000 +++ usagestats-1.0.1/usagestats.py 2021-07-05 07:04:13.000000000 +0000 @@ -7,7 +7,13 @@ import sys -__version__ = '1.0' +__version__ = '1.0.1' + + +try: + import pathlib +except ImportError: + pathlib = None logger = logging.getLogger('usagestats') @@ -137,6 +143,8 @@ if ssl_verify is None or isinstance(ssl_verify, str): self.ssl_verify = ssl_verify + elif pathlib and isinstance(ssl_verify, pathlib.Path): + self.ssl_verify = str(ssl_verify) elif isinstance(ssl_verify, bytes): # bytes on PY3 self.ssl_verify = ssl_verify.decode('utf-8') else: # unicode on PY2 @@ -336,8 +344,8 @@ if not self.sending: fullname = os.path.join(self.location, filename) with open(fullname, 'wb') as fp: - for l in generator(): - fp.write(l) + for line in generator(): + fp.write(line) # Show prompt sys.stderr.write(self.prompt.prompt) @@ -374,8 +382,8 @@ logger.warning("Couldn't upload report: %s", str(e)) fullname = os.path.join(self.location, filename) with open(fullname, 'wb') as fp: - for l in generator(): - fp.write(l) + for line in generator(): + fp.write(line) else: try: r.raise_for_status()