Skip to content

Commit 1ae1847

Browse files
committed
Filter tag names at setup for non-ISO-8859-1 symbols
1 parent e4fd40f commit 1ae1847

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

server/enip/logix.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,12 @@ def setup( **kwds ):
853853
key_utf8 = key.decode( 'utf-8' )
854854
else:
855855
key_utf8 = key
856-
key_bytes = key_utf8.encode( 'iso-8859-1' )
856+
try:
857+
key_bytes = key_utf8.encode( 'iso-8859-1' )
858+
except UnicodeEncodeError as exc:
859+
message = u"Setup tag {!r}; contains non-ISO-8859-1 symbols".format( key_utf8 )
860+
log.error( message )
861+
raise ValueError( message )
857862
key_8859 = key_bytes.decode('iso-8859-1')
858863
log.info( u"Setup tag {!r}, to UTF-8: {!r}, to bytes: {!r}, to ISO-8859-1: {!r}".format(
859864
key, key_utf8, key_bytes, key_8859 ))

0 commit comments

Comments
 (0)