small cleanup

opcua/node.py

@@ -113,6 +113,8 @@ class Node(object):
     def add_folder(self, *args):
         """
         create a child node folder
+        arguments are nodeid, browsename
+        or namespace index, name
         """
         nodeid, qname = self._parse_add_args(*args)
         return self._add_folder(nodeid, qname)
@@ -158,9 +160,6 @@ class Node(object):
         results[0].StatusCode.check()
         return Node(self.server, nodeid)
 
-    #def add_property(self, *args):
-        #return self.add_variable(*args, isproperty=True)
-
     def add_property(self, *args):
         """
         create a child node property
@@ -168,15 +167,8 @@ class Node(object):
         or idx, name, value, [variant type]
         """
         nodeid, qname = self._parse_add_args(*args[:2])
-        val = args[2]
-        if type(val) is ua.Variant:
-            return self._add_variable(nodeid, qname, val)
-        else:
-            if len(args) > 3:
-                val = ua.Variant(val, args[3])
-            else:
-                val = ua.Variant(val)
-            return self._add_variable(nodeid, qname, val, isproperty=True)
+        val = self._to_variant(*args[2:])
+        return self._add_variable(nodeid, qname, val, isproperty=True)
         
     def add_variable(self, *args):
         """
@@ -185,16 +177,15 @@ class Node(object):
         or idx, name, value, [variant type]
         """
         nodeid, qname = self._parse_add_args(*args[:2])
-        val = args[2]
+        val = self._to_variant(*args[2:])
+        return self._add_variable(nodeid, qname, val, isproperty=False)
+
+    def _to_variant(self, val, vtype=None):
         if type(val) is ua.Variant:
-            return self._add_variable(nodeid, qname, val)
+            return val
         else:
-            if len(args) > 3:
-                val = ua.Variant(val, args[3])
-            else:
-                val = ua.Variant(val)
-            return self._add_variable(nodeid, qname, val, isproperty=False)
-        
+            return ua.Variant(val, vtype)
+
     def _add_variable(self, nodeid, qname, val, isproperty=False):
         node = ua.AddNodesItem()
         node.RequestedNewNodeId = nodeid