From d34d37f1096949426e74dd9b816a58956a1edd3f Mon Sep 17 00:00:00 2001 From: NaruX Date: Thu, 21 Sep 2017 12:59:25 +0200 Subject: [PATCH] =?UTF-8?q?NetFH.close()=20mehrfach=20aufrufbar=20ohne=20F?= =?UTF-8?q?ehler=20Socket=20schlie=C3=9Fen,=20wenn=20Fehler=20bei=20Verbin?= =?UTF-8?q?dung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- revpimodio2/netio.py | 19 ++++++++++--------- setup.py | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/revpimodio2/netio.py b/revpimodio2/netio.py index e4a2837..947ee18 100644 --- a/revpimodio2/netio.py +++ b/revpimodio2/netio.py @@ -77,7 +77,7 @@ class NetFH(Thread): try: so.connect(self._address) except: - pass + so.close() else: # Alten Socket trennen with self.__socklock: @@ -129,14 +129,15 @@ class NetFH(Thread): self.__sockerr.set() # Vom Socket sauber trennen - with self.__socklock: - try: - if self.__sockend: - self._slavesock.send(_sysexit) - else: - self._slavesock.shutdown(socket.SHUT_RDWR) - except: - pass + if self._slavesock is not None: + with self.__socklock: + try: + if self.__sockend: + self._slavesock.send(_sysexit) + else: + self._slavesock.shutdown(socket.SHUT_RDWR) + except: + pass self._slavesock.close() def flush(self): diff --git a/setup.py b/setup.py index 784ee18..9b0f497 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup( license="LGPLv3", name="revpimodio2", - version="2.1.1", + version="2.1.1b2", packages=["revpimodio2"], python_requires="~=3.2", @@ -35,7 +35,7 @@ setup( "zugegriffen werden.", classifiers=[ - "Development Status :: 5 - Production/Stable", + "Development Status :: 4 - Beta", "Environment :: Console", "Intended Audience :: Developers", "License :: OSI Approved :: "