1
0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00

backport changes to py25 and py27

This commit is contained in:
Joel Bender 2015-07-31 21:42:42 -04:00
parent 6b5c58e5ac
commit 263853760c
3 changed files with 7 additions and 7 deletions

View File

@ -107,9 +107,9 @@ class LocalDeviceObject(DeviceObject, Logging):
# check for registration
if self.__class__ not in registered_object_types.values():
if 'vendorId' not in kwargs:
raise RuntimeError("vendorId required to auto-register the LocalDeviceObject class")
register_object_type(self.__class__, vendor_id=kwargs['vendorId'])
if 'vendorIdentifier' not in kwargs:
raise RuntimeError("vendorIdentifier required to auto-register the LocalDeviceObject class")
register_object_type(self.__class__, vendor_id=kwargs['vendorIdentifier'])
# check for local time
if 'localDate' in kwargs:

View File

@ -107,9 +107,9 @@ class LocalDeviceObject(DeviceObject, Logging):
# check for registration
if self.__class__ not in registered_object_types.values():
if 'vendorId' not in kwargs:
raise RuntimeError("vendorId required to auto-register the LocalDeviceObject class")
register_object_type(self.__class__, vendor_id=kwargs['vendorId'])
if 'vendorIdentifier' not in kwargs:
raise RuntimeError("vendorIdentifier required to auto-register the LocalDeviceObject class")
register_object_type(self.__class__, vendor_id=kwargs['vendorIdentifier'])
# check for local time
if 'localDate' in kwargs:

View File

@ -108,7 +108,7 @@ class LocalDeviceObject(DeviceObject, Logging):
# check for registration
if self.__class__ not in registered_object_types.values():
if 'vendorIdentifier' not in kwargs:
raise RuntimeError("vendorId required to auto-register the LocalDeviceObject class")
raise RuntimeError("vendorIdentifier required to auto-register the LocalDeviceObject class")
register_object_type(self.__class__, vendor_id=kwargs['vendorIdentifier'])
# check for local time