mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-10-27 00:57:47 +08:00
Code Issues Releases Wiki Activity

merge resolved - testing in wrong branch

Browse Source
This commit is contained in:
Joel Bender
2015-08-03 01:03:17 -04:00
parent b7fe2d132b 2c0280c6c4
commit 4570f1dbfc
11 changed files with 133 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
py25/bacpypes/consolelogging.py
View File

@@ -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)

26
py25/bacpypes/pdu.py
View File

@@ -83,7 +83,7 @@ class Address:
if (addr < 0) or (addr >= 256):
raise ValueError("address out of range")
self.addrAddr = struct.pack('b', addr)
self.addrAddr = struct.pack('B', addr)
self.addrLen = 1
elif isinstance(addr, str):
@@ -133,7 +133,7 @@ class Address:
if (addr > 255):
raise ValueError("address out of range")
self.addrAddr = struct.pack('b', addr)
self.addrAddr = struct.pack('B', addr)
self.addrLen = 1
elif re.match(r"^\d+:[*]$", addr):
@@ -161,7 +161,7 @@ class Address:
self.addrType = Address.remoteStationAddr
self.addrNet = net
self.addrAddr = struct.pack('b', addr)
self.addrAddr = struct.pack('B', addr)
self.addrLen = 1
elif re.match(r"^0x([0-9A-Fa-f][0-9A-Fa-f])+$",addr):
@@ -337,17 +337,17 @@ class LocalStation(Address):
if (addr < 0) or (addr >= 256):
raise ValueError("address out of range")
self.addrAddr = struct.pack('b', addr)
self.addrAddr = struct.pack('B', addr)
self.addrLen = 1
elif isinstance(addr, (bytes, bytearray)):
if _debug: Address._debug(" - bytes or bytearray")
elif isinstance(addr, str):
if _debug: Address._debug(" - string (bytes)")
self.addrAddr = bytes(addr)
self.addrAddr = addr
self.addrLen = len(addr)
else:
raise TypeError("integer, bytes or bytearray required")
raise TypeError("integer or string (bytes) required")
#
# RemoteStation
@@ -366,17 +366,17 @@ class RemoteStation(Address):
if (addr < 0) or (addr >= 256):
raise ValueError("address out of range")
self.addrAddr = struct.pack('b', addr)
self.addrAddr = struct.pack('B', addr)
self.addrLen = 1
elif isinstance(addr, (bytes, bytearray)):
if _debug: Address._debug(" - bytes or bytearray")
elif isinstance(addr, str):
if _debug: Address._debug(" - string (bytes)")
self.addrAddr = bytes(addr)
self.addrAddr = addr
self.addrLen = len(addr)
else:
raise TypeError("integer, bytes or bytearray required")
raise TypeError("integer or string (bytes) required")
#
# LocalBroadcast

2
py25/bacpypes/primitivedata.py
View File

@@ -189,7 +189,7 @@ class Tag(object):
# context booleans have value in data
if (dataType == Tag.booleanAppTag):
return Tag(Tag.applicationTagClass, Tag.booleanAppTag, struct.unpack('b', self.tagData)[0], '')
return Tag(Tag.applicationTagClass, Tag.booleanAppTag, struct.unpack('B', self.tagData)[0], '')
else:
return ApplicationTag(dataType, self.tagData)