mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-10-05 22:18:16 +08:00
Code Issues Releases Wiki Activity

make the str() of a CharacterString more closely match an OctetString because the strValue is an octet string

Browse Source
This commit is contained in:
Joel Bender 2015-09-05 23:56:56 -04:00
parent 6d804c4df1
commit b5d2b56191
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py25/bacpypes/primitivedata.py
View File

@ -824,7 +824,7 @@ class CharacterString(Atomic):
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,X'%s')" % (self.strEncoding, btox(self.strValue))
# #
# BitString # BitString

2
py27/bacpypes/primitivedata.py
View File

@ -824,7 +824,7 @@ class CharacterString(Atomic):
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,X'%s')" % (self.strEncoding, btox(self.strValue))
# #
# BitString # BitString

2
py34/bacpypes/primitivedata.py
View File

@ -837,7 +837,7 @@ class CharacterString(Atomic):
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,X'%s')" % (self.strEncoding, btox(self.strValue))
# #
# BitString # BitString

2
tests/test_primitive_data/test_character_string.py
View File

@ -88,7 +88,7 @@ class TestCharacterString(unittest.TestCase):
obj = CharacterString("hello") obj = CharacterString("hello")
assert obj.value == "hello" assert obj.value == "hello"
assert str(obj) == "CharacterString(0,'hello')" assert str(obj) == "CharacterString(0,X'68656c6c6f')"
def test_character_string_tag(self): def test_character_string_tag(self):
if _debug: TestCharacterString._debug("test_character_string_tag") if _debug: TestCharacterString._debug("test_character_string_tag")