Merge pull request #22 from rambo/tcp_eventloop_fix

Fix eventloop issues with TCPTransport

Author: rambo

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.0
+current_version = 2.5.1
 commit = False
 tag = False
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "scpi"
-version = "2.5.0"
+version = "2.5.1"
 description = "Basic idea here is to make transport-independent command sender/parser and a device baseclass that implements the common SCPI commands"
 authors = ["Eero af Heurlin <eero.afheurlin@iki.fi>"]
 homepage = "https://github.com/rambo/python-scpi/"

src/scpi/__init__.py

@@ -1,7 +1,7 @@
 """SCPI module, the scpi class implements the base command set, devices may extend it.
 transports are separate from devices (so you can use for example hp6632b with either serial port or GPIB)"""
 
-__version__ = "2.5.0"  # NOTE Use `bump2version --config-file patch` to bump versions correctly
+__version__ = "2.5.1"  # NOTE Use `bump2version --config-file patch` to bump versions correctly
 from .scpi import SCPIProtocol, SCPIDevice
 from .errors import CommandError
 

src/scpi/transports/tcp.py

@@ -31,11 +31,13 @@ def __post_init__(self) -> None:
         """Call open_connection in an eventloop"""
         if self.ipaddr is None or self.port is None:
             raise ValueError("ipaddr and port must be given")
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(self.open_connection(self.ipaddr, self.port))
 
     async def send_command(self, command: str) -> None:
         """Write command to the stream"""
+        if not self.writer:
+            assert self.ipaddr
+            assert self.port
+            await self.open_connection(self.ipaddr, self.port)
         if not self.writer:
             raise RuntimeError("Writer not set")
         async with self.lock:
@@ -46,6 +48,10 @@ async def send_command(self, command: str) -> None:
 
     async def get_response(self) -> str:
         """Get response from the stream"""
+        if not self.reader:
+            assert self.ipaddr
+            assert self.port
+            await self.open_connection(self.ipaddr, self.port)
         if not self.reader:
             raise RuntimeError("Reader not set")
         async with self.lock:

tests/test_scpi.py

@@ -5,4 +5,4 @@
 
 def test_version() -> None:
     """Make sure version matches expected"""
-    assert __version__ == "2.5.0"
+    assert __version__ == "2.5.1"