allow the property identifier in commands to be just an integer, it w…

…as inconsistent in the samples
JoelBender · Nov 4, 2020 · 47714a2 · 47714a2
1 parent f834e53
commit 47714a2
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 2 deletions.
diff --git a/samples/Discover.py b/samples/Discover.py
@@ -548,6 +548,8 @@ def do_rp(self, args):
 
             devid = int(devid)
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/HTTPServer.py b/samples/HTTPServer.py
@@ -131,6 +131,8 @@ def do_read(self, args):
             # implement a default property, the bain of committee meetings
             if len(args) == 3:
                 prop_id = args[2]
+                if prop_id.isdigit():
+                    prop_id = int(prop_id)
             else:
                 prop_id = "presentValue"
 

diff --git a/samples/ReadProperty.py b/samples/ReadProperty.py
@@ -43,6 +43,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/ReadProperty25.py b/samples/ReadProperty25.py
@@ -46,6 +46,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/ReadPropertyAny.py b/samples/ReadPropertyAny.py
@@ -48,6 +48,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             # build a request
             request = ReadPropertyRequest(

diff --git a/samples/ReadPropertyForeign.py b/samples/ReadPropertyForeign.py
@@ -57,6 +57,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/ReadPropertyJSON.py b/samples/ReadPropertyJSON.py
@@ -51,6 +51,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/ReadRange.py b/samples/ReadRange.py
@@ -60,6 +60,8 @@ def do_readrange(self, args):
             addr = Address(args.pop(0))
             obj_id = ObjectIdentifier(args.pop(0)).value
             prop_id = args.pop(0)
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/ReadWriteProperty.py b/samples/ReadWriteProperty.py
@@ -51,6 +51,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/VendorReadWriteProperty.py b/samples/VendorReadWriteProperty.py
@@ -51,9 +51,9 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
-
             if prop_id.isdigit():
                 prop_id = int(prop_id)
+
             if _debug: ReadWritePropertyConsoleCmd._debug("    - prop_id: %r", prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id, VendorAVObject.vendor_id)

diff --git a/samples/WriteLightingCommand.py b/samples/WriteLightingCommand.py
@@ -52,6 +52,8 @@ def do_read(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             datatype = get_datatype(obj_id[0], prop_id)
             if not datatype:

diff --git a/samples/WriteSomething.py b/samples/WriteSomething.py
@@ -47,7 +47,8 @@ def do_write(self, args):
         try:
             addr, obj_id, prop_id = args[:3]
             obj_id = ObjectIdentifier(obj_id).value
-            prop_id = int(prop_id)
+            if prop_id.isdigit():
+                prop_id = int(prop_id)
 
             # build a request
             request = WritePropertyRequest(