From 9af0e54c7cd2692a682164de11e23c93efe2351a Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Fri, 15 Feb 2019 18:35:42 -0500 Subject: [PATCH] fix syntax and remove string format function call (#243) --- py25/bacpypes/appservice.py | 2 +- py25/bacpypes/comm.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/py25/bacpypes/appservice.py b/py25/bacpypes/appservice.py index b411c02..6e20745 100755 --- a/py25/bacpypes/appservice.py +++ b/py25/bacpypes/appservice.py @@ -157,7 +157,7 @@ class SSM(OneShotTask, DebugContents): # check for invalid segment number if indx >= self.segmentCount: - raise RuntimeError("invalid segment number {0}, APDU has {1} segments".format(indx, self.segmentCount)) + raise RuntimeError("invalid segment number %r, APDU has %r segments" % (indx, self.segmentCount)) if self.segmentAPDU.apduType == ConfirmedRequestPDU.pduType: if _debug: SSM._debug(" - confirmed request context") diff --git a/py25/bacpypes/comm.py b/py25/bacpypes/comm.py index 27b7f4e..765744f 100755 --- a/py25/bacpypes/comm.py +++ b/py25/bacpypes/comm.py @@ -419,7 +419,9 @@ class Switch(Client, Server): Server.__init__(self) # wrap the terminals - self.terminals = {k:Switch.TerminalWrapper(self, v) for k, v in terminals.items()} + self.terminals = {} + for k, v in terminals.items(): + self.terminals[k] = Switch.TerminalWrapper(self, v) self.current_terminal = None def __getitem__(self, key):