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

Python3 no longer uses __cmp__, incorrect initialization for octet strings

Browse Source
This commit is contained in:
Joel Bender 2015-08-12 09:07:11 -04:00
parent 22c5fe48f3
commit 34ed6bd399
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
py34/bacpypes/primitivedata.py
View File

@ -451,6 +451,8 @@ class Atomic(object):
_app_tag = None _app_tag = None
def __cmp__(self, other): def __cmp__(self, other):
# sys.stderr.write("__cmp__ %r %r\n" % (self, other))
# hoop jump it # hoop jump it
if not isinstance(other, self.__class__): if not isinstance(other, self.__class__):
other = self.__class__(other) other = self.__class__(other)
@ -463,6 +465,26 @@ class Atomic(object):
else: else:
return 0 return 0
def __lt__(self, other):
# sys.stderr.write("__lt__ %r %r\n" % (self, other))
# hoop jump it
if not isinstance(other, self.__class__):
other = self.__class__(other)
# now compare the values
return (self.value < other.value)
def __eq__(self, other):
sys.stderr.write("__eq__ %r %r\n" % (self, other))
# hoop jump it
if not isinstance(other, self.__class__):
other = self.__class__(other)
# now compare the values
return self.value == other.value
# #
# Null # Null
# #
@ -738,7 +760,7 @@ class OctetString(Atomic):
_app_tag = Tag.octetStringAppTag _app_tag = Tag.octetStringAppTag
def __init__(self, arg=None): def __init__(self, arg=None):
self.value = '' self.value = bytes()
if arg is None: if arg is None:
pass pass