From ae37b3cfdbd52d2eb06476b40a404a7339939e76 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 03 2019 18:57:31 +0000 Subject: [PATCH 1/2] Move socket creation into the try block for Python 3.8 support Fixes https://pagure.io/python-daemon/issue/34 --- diff --git a/daemon/daemon.py b/daemon/daemon.py index 1a75bc4..df2d3a8 100644 --- a/daemon/daemon.py +++ b/daemon/daemon.py @@ -761,9 +761,8 @@ def is_socket(fd): """ result = False - file_socket = socket.fromfd(fd, socket.AF_INET, socket.SOCK_RAW) - try: + file_socket = socket.fromfd(fd, socket.AF_INET, socket.SOCK_RAW) file_socket.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE) except socket.error as exc: exc_errno = exc.args[0] From 71c672634573ddb8d13ed3a1f14f74d8589ae1eb Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 03 2019 18:57:40 +0000 Subject: [PATCH 2/2] Allow running make in tox:static-analysis --- diff --git a/tox.ini b/tox.ini index 6b75c05..720d187 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ commands = [testenv:static-analysis] deps = -r{toxinidir}/pip-requirements/static-analysis.txt +whitelist_externals = make commands = make clean python3 -m pycodestyle