fix pylama errors on PR92 + editorial fix

Browse Source
This commit is contained in:
Hans Erik van Elburg 2021-11-21 16:08:47 +01:00
parent 00248f490e
commit 28e3c51f0d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dsmr_parser/clients/protocol.py
View File

@ -113,7 +113,7 @@ class DSMRProtocol(asyncio.Protocol):
self.telegram_buffer.append(data) self.telegram_buffer.append(data)
for telegram in self.telegram_buffer.get_all(): for telegram in self.telegram_buffer.get_all():
# ensure actual telegram is ascii (7-bit) only (IEC 646 required in section 5.4 of IEC 62056-21) # ensure actual telegram is ascii (7-bit) only (ISO 646:1991 IRV required in section 5.5 of IEC 62056-21)
telegram = telegram.encode("latin1").decode("ascii") telegram = telegram.encode("latin1").decode("ascii")
self.handle_telegram(telegram) self.handle_telegram(telegram)

7
test/example_telegrams.py
View File

@ -136,7 +136,7 @@ TELEGRAM_V5 = (
# #
# last two lines are added by the COM-1 Ethernet Gateway # last two lines are added by the COM-1 Ethernet Gateway
TELEGRAM_ESY5Q3DB1024_V304 = ( # Easymeter an Hauptstromzähler TELEGRAM_ESY5Q3DB1024_V304 = (
'/ESY5Q3DB1024 V3.04\r\n' '/ESY5Q3DB1024 V3.04\r\n'
'\r\n' '\r\n'
'1-0:0.0.0*255(0272031312565)\r\n' '1-0:0.0.0*255(0272031312565)\r\n'
@ -150,10 +150,11 @@ TELEGRAM_ESY5Q3DB1024_V304 = ( # Easymeter an Hauptstromzähler
'0-0:96.1.255*255(1ESY1313002565)\r\n' '0-0:96.1.255*255(1ESY1313002565)\r\n'
'!\r\n' '!\r\n'
' 25803103\r\n' ' 25803103\r\n'
'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\r\n' '\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'
'\xff\xff\xff\xff\xff\r\n'
) )
TELEGRAM_ESY5Q3DA1004_V304 = ( # Easymeter an Wärmepumpe TELEGRAM_ESY5Q3DA1004_V304 = (
'/ESY5Q3DA1004 V3.04\r\n' '/ESY5Q3DA1004 V3.04\r\n'
'\r\n' '\r\n'
'1-0:0.0.0*255(1336001560)\r\n' '1-0:0.0.0*255(1336001560)\r\n'