mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

merge resolved

Browse Source
This commit is contained in:
Joel Bender 2015-08-03 00:52:23 -04:00
commit 7f80cc43d8
5 changed files with 6 additions and 9 deletions
Show Stats 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)

3
py27/bacpypes/consolelogging.py
View File

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

2
py34/bacpypes/bvllservice.py
View File

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

3
py34/bacpypes/consolelogging.py
View File

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

4
py34/bacpypes/pdu.py
View File

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