#35 Move socket creation into the try block for Python 3.8 support
Closed 5 years ago by churchyard. Opened 5 years ago by churchyard.
churchyard/python-daemon py38  into  master

file modified
+1 -2
@@ -761,9 +761,8 @@ 

          """

      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]

file modified
+1
@@ -18,6 +18,7 @@ 

  

  [testenv:static-analysis]

  deps = -r{toxinidir}/pip-requirements/static-analysis.txt

+ whitelist_externals = make

  commands =

      make clean

      python3 -m pycodestyle

  • one unrelated commit that allowed me to test this

Fixes https://pagure.io/python-daemon/issue/34

Thanks for the merge request.

one unrelated commit that allowed me to test this

I wanted that along with some other changes for newer Tox, so I have made the change separately.

I have made a separate change that is based on this fix. Thanks!

Pull-Request has been closed by churchyard

5 years ago
Metadata