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

make a clearer distinction between the value (str) and encoded value (bytes) (again?)

Browse Source
This commit is contained in:
Joel Bender 2015-08-24 14:03:42 -04:00
parent 46f9b19fbf
commit 00a74fb8a2
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
py34/bacpypes/primitivedata.py
View File

@ -797,14 +797,15 @@ class CharacterString(Atomic):
def __init__(self, arg=None): def __init__(self, arg=None):
self.value = '' self.value = ''
self.strEncoding = 0 self.strEncoding = 0
self.strValue = '' self.strValue = b''
if arg is None: if arg is None:
pass pass
elif isinstance(arg, Tag): elif isinstance(arg, Tag):
self.decode(arg) self.decode(arg)
elif isinstance(arg, str): elif isinstance(arg, str):
self.strValue = self.value = arg self.value = arg
self.strValue = arg.encode('utf-8')
elif isinstance(arg, CharacterString): elif isinstance(arg, CharacterString):
self.value = arg.value self.value = arg.value
self.strEncoding = arg.strEncoding self.strEncoding = arg.strEncoding
@ -814,7 +815,7 @@ class CharacterString(Atomic):
def encode(self, tag): def encode(self, tag):
# encode the tag # encode the tag
tag.set_app_data(Tag.characterStringAppTag, (chr(self.strEncoding)+self.strValue.encode('latin-1'))) tag.set_app_data(Tag.characterStringAppTag, bytes([self.strEncoding]) + self.strValue)
def decode(self, tag): def decode(self, tag):
if (tag.tagClass != Tag.applicationTagClass) or (tag.tagNumber != Tag.characterStringAppTag): if (tag.tagClass != Tag.applicationTagClass) or (tag.tagNumber != Tag.characterStringAppTag):
@ -829,26 +830,18 @@ class CharacterString(Atomic):
# normalize the value # normalize the value
if (self.strEncoding == 0): if (self.strEncoding == 0):
udata = self.strValue.decode('utf-8') self.value = self.strValue.decode('utf-8')
self.value = str(udata)
#self.value = str(udata.encode('ascii', 'backslashreplace'))
elif (self.strEncoding == 3): elif (self.strEncoding == 3):
udata = self.strValue.decode('utf_32be') self.value = self.strValue.decode('utf_32be')
self.value = str(udata)
#self.value = str(udata.encode('ascii', 'backslashreplace'))
elif (self.strEncoding == 4): elif (self.strEncoding == 4):
udata = self.strValue.decode('utf_16be') self.value = self.strValue.decode('utf_16be')
self.value = str(udata)
#self.value = str(udata.encode('ascii', 'backslashreplace'))
elif (self.strEncoding == 5): elif (self.strEncoding == 5):
udata = self.strValue.decode('latin_1') self.value = self.strValue.decode('latin_1')
self.value = str(udata)
#self.value = str(udata.encode('ascii', 'backslashreplace'))
else: else:
self.value = '### unknown encoding: %d ###' % (self.strEncoding,) self.value = '### unknown encoding: %d ###' % (self.strEncoding,)
def __str__(self): def __str__(self):
return "CharacterString(%d," % (self.strEncoding,) + repr(self.strValue) + ")" return "CharacterString(%d," % (self.strEncoding,) + repr(self.value) + ")"
# #
# BitString # BitString