merge #160

JoelBender · Feb 17, 2018 · d8703a4 · d8703a4
1 parent 83857fe
commit d8703a4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/py25/bacpypes/service/device.py b/py25/bacpypes/service/device.py
@@ -113,13 +113,15 @@ def __init__(self, **kwargs):
         if 'objectIdentifier' not in kwargs:
             raise RuntimeError("objectIdentifier is required")
 
+        # coerce the object identifier
+        object_identifier = kwargs['objectIdentifier']
+        if isinstance(object_identifier, (int, long)):
+            object_identifier = ('device', object_identifier)
+
         # the object list is provided
         if 'objectList' in kwargs:
             raise RuntimeError("objectList is provided by LocalDeviceObject and cannot be overridden")
-        else:
-            kwargs['objectList'] = ArrayOf(ObjectIdentifier)([
-                kwargs['objectIdentifier'],
-                ])
+        kwargs['objectList'] = ArrayOf(ObjectIdentifier)([object_identifier])
 
         # check for a minimum value
         if kwargs['maxApduLengthAccepted'] < 50:

diff --git a/py27/bacpypes/service/device.py b/py27/bacpypes/service/device.py
@@ -114,13 +114,15 @@ def __init__(self, **kwargs):
         if 'objectIdentifier' not in kwargs:
             raise RuntimeError("objectIdentifier is required")
 
+        # coerce the object identifier
+        object_identifier = kwargs['objectIdentifier']
+        if isinstance(object_identifier, (int, long)):
+            object_identifier = ('device', object_identifier)
+
         # the object list is provided
         if 'objectList' in kwargs:
             raise RuntimeError("objectList is provided by LocalDeviceObject and cannot be overridden")
-        else:
-            kwargs['objectList'] = ArrayOf(ObjectIdentifier)([
-                kwargs['objectIdentifier'],
-                ])
+        kwargs['objectList'] = ArrayOf(ObjectIdentifier)([object_identifier])
 
         # check for a minimum value
         if kwargs['maxApduLengthAccepted'] < 50:

diff --git a/py34/bacpypes/service/device.py b/py34/bacpypes/service/device.py
@@ -114,13 +114,15 @@ def __init__(self, **kwargs):
         if 'objectIdentifier' not in kwargs:
             raise RuntimeError("objectIdentifier is required")
 
+        # coerce the object identifier
+        object_identifier = kwargs['objectIdentifier']
+        if isinstance(object_identifier, int):
+            object_identifier = ('device', object_identifier)
+
         # the object list is provided
         if 'objectList' in kwargs:
             raise RuntimeError("objectList is provided by LocalDeviceObject and cannot be overridden")
-        else:
-            kwargs['objectList'] = ArrayOf(ObjectIdentifier)([
-                kwargs['objectIdentifier'],
-                ])
+        kwargs['objectList'] = ArrayOf(ObjectIdentifier)([object_identifier])
 
         # check for a minimum value
         if kwargs['maxApduLengthAccepted'] < 50: