python-selve-new 2.0.55__tar.gz → 2.0.56__tar.gz

{python-selve-new-2.0.55 → python-selve-new-2.0.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-selve-new
-Version: 2.0.55
+Version: 2.0.56
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python-selve-new-2.0.55 → python-selve-new-2.0.56}/python_selve_new.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-selve-new
-Version: 2.0.55
+Version: 2.0.56
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python-selve-new-2.0.55 → python-selve-new-2.0.56}/selve/__init__.py

@@ -87,18 +87,18 @@ class Selve:
             self.discover()
 
     
-    def _worker(self, selve: Selve, _writeLock, _readLock):
+    def _worker(self, selve: Selve):
         # Infinite loop to collect all incoming data
-        self._LOGGER.debug("Worker started")
+        selve._LOGGER.debug("Worker started")
         try:
             while True:
                 if not selve._pauseWorker:
                     selve._pauseWorkerEvent.clear()
                     if not selve._pauseReader:
                         selve._pauseReaderEvent.clear()
-                        with _readLock():
-                            if not self._serial.is_open:
-                                self._serial.open()
+                        with selve._readLock:
+                            if not selve._serial.is_open:
+                                selve._serial.open()
                             if selve._serial.in_waiting > 0:
                                 msg = ""
                                 while True:
@@ -122,9 +122,9 @@ class Selve:
                             commandstr = data.serializeToXML()
                             selve._LOGGER.debug('Gateway writing: ' + str(commandstr))
                             try:
-                                with _writeLock():
-                                    if not self._serial.is_open:
-                                        self._serial.open()
+                                with selve._writeLock:
+                                    if not selve._serial.is_open:
+                                        selve._serial.open()
                                     selve._serial.write(commandstr)
                                     selve._serial.flush()
                             except Exception as e:
@@ -217,7 +217,7 @@ class Selve:
         self._pauseWriter = False
         self._pauseWorker = False
         self._stopThread = False
-        self.workerTask = threading.Thread(target=self._worker, args=(self, lambda: self._writeLock, lambda: self._readLock), daemon=True)
+        self.workerTask = threading.Thread(target=self._worker, args=(self, self._writeLock, self._readLock), daemon=True)
         self.workerTask.start()
 
     def stopWorker(self):

{python-selve-new-2.0.55 → python-selve-new-2.0.56}/setup.py

@@ -15,7 +15,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
 setup(
     
     name='python-selve-new',  # Required    
-    version='2.0.55',  # Required
+    version='2.0.56',  # Required
     description='Python library for interfacing with selve devices using the USB-RF controller. Written completely new.',  # Required   
     long_description=long_description,  # Optional 
     long_description_content_type="text/markdown",