From 937da3578014a0dce0c44febf000c383c74d6965 Mon Sep 17 00:00:00 2001 From: Christian Tremblay Date: Fri, 31 Jul 2015 19:58:25 -0400 Subject: [PATCH 1/4] No need to struct.unpack as pdu.pduData is already hex in that specific context Signed-off-by: Christian Tremblay --- py34/bacpypes/bvllservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py34/bacpypes/bvllservice.py b/py34/bacpypes/bvllservice.py index b81f4eb..7e93716 100755 --- a/py34/bacpypes/bvllservice.py +++ b/py34/bacpypes/bvllservice.py @@ -141,7 +141,7 @@ class UDPMultiplexer: return # extract the first octet - msg_type = struct.unpack('b', pdu.pduData[:1])[0] + msg_type = (pdu.pduData)[0] # check for the message type if msg_type == 0x01: From 8cba67d803452fe5afeb1668e5c5593938b970b9 Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Fri, 31 Jul 2015 21:56:25 -0400 Subject: [PATCH 2/4] minor stylistic change --- py34/bacpypes/bvllservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py34/bacpypes/bvllservice.py b/py34/bacpypes/bvllservice.py index 7e93716..02956a8 100755 --- a/py34/bacpypes/bvllservice.py +++ b/py34/bacpypes/bvllservice.py @@ -141,7 +141,7 @@ class UDPMultiplexer: return # extract the first octet - msg_type = (pdu.pduData)[0] + msg_type = pdu.pduData[0] # check for the message type if msg_type == 0x01: From 8d6508a8539a953e4a286f1ce5fe4a6893b00008 Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Fri, 31 Jul 2015 23:23:44 -0400 Subject: [PATCH 3/4] turn the first byte into an int, then pass to str() --- py34/bacpypes/pdu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py34/bacpypes/pdu.py b/py34/bacpypes/pdu.py index 09f5d09..f09704e 100755 --- a/py34/bacpypes/pdu.py +++ b/py34/bacpypes/pdu.py @@ -265,7 +265,7 @@ class Address: elif self.addrType == Address.localStationAddr: rslt = '' if self.addrLen == 1: - rslt += str(self.addrAddr) + rslt += str(self.addrAddr[0]) else: port = struct.unpack('!H', self.addrAddr[-2:])[0] if (len(self.addrAddr) == 6) and (port >= 47808) and (port <= 47823): @@ -282,7 +282,7 @@ class Address: elif self.addrType == Address.remoteStationAddr: rslt = '%d:' % (self.addrNet,) if self.addrLen == 1: - rslt += str(self.addrAddr) + rslt += str(self.addrAddr[0]) else: port = struct.unpack('!H', self.addrAddr[-2:])[0] if (len(self.addrAddr) == 6) and (port >= 47808) and (port <= 47823): From 85a8ce955818c7bd9288b6da752f0357534d0dfe Mon Sep 17 00:00:00 2001 From: Joel Bender Date: Sun, 2 Aug 2015 22:17:11 -0400 Subject: [PATCH 4/4] fixes #10 --- py25/bacpypes/consolelogging.py | 3 +-- py27/bacpypes/consolelogging.py | 3 +-- py34/bacpypes/consolelogging.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/py25/bacpypes/consolelogging.py b/py25/bacpypes/consolelogging.py index ead9041..4442961 100755 --- a/py25/bacpypes/consolelogging.py +++ b/py25/bacpypes/consolelogging.py @@ -115,8 +115,7 @@ class ArgumentParser(_ArgumentParser): # check to dump labels if result_args.buggers: - loggers = logging.Logger.manager.loggerDict.keys() - loggers.sort() + loggers = sorted(logging.Logger.manager.loggerDict.keys()) for loggerName in loggers: sys.stdout.write(loggerName + '\n') sys.exit(0) diff --git a/py27/bacpypes/consolelogging.py b/py27/bacpypes/consolelogging.py index e2b0bf6..9f022b6 100755 --- a/py27/bacpypes/consolelogging.py +++ b/py27/bacpypes/consolelogging.py @@ -106,8 +106,7 @@ class ArgumentParser(argparse.ArgumentParser): # check to dump labels if result_args.buggers: - loggers = logging.Logger.manager.loggerDict.keys() - loggers.sort() + loggers = sorted(logging.Logger.manager.loggerDict.keys()) for loggerName in loggers: sys.stdout.write(loggerName + '\n') sys.exit(0) diff --git a/py34/bacpypes/consolelogging.py b/py34/bacpypes/consolelogging.py index 89cc12c..8c8349f 100755 --- a/py34/bacpypes/consolelogging.py +++ b/py34/bacpypes/consolelogging.py @@ -106,8 +106,7 @@ class ArgumentParser(argparse.ArgumentParser): # check to dump labels if result_args.buggers: - loggers = logging.Logger.manager.loggerDict.keys() - loggers.sort() + loggers = sorted(logging.Logger.manager.loggerDict.keys()) for loggerName in loggers: sys.stdout.write(loggerName + '\n') sys.exit(0)