Commit 98cda158 authored by olivier R-D's avatar olivier R-D

fix typo, reduce print

parent e8152767
...@@ -21,7 +21,6 @@ def ua_type_to_python(val, uatype): ...@@ -21,7 +21,6 @@ def ua_type_to_python(val, uatype):
def to_python(val, obj, attname): def to_python(val, obj, attname):
print(val, obj, attname)
if isinstance(obj, ua.NodeId) and attname == "Identifier": if isinstance(obj, ua.NodeId) and attname == "Identifier":
return ua.NodeId.from_string(val) return ua.NodeId.from_string(val)
else: else:
...@@ -149,7 +148,6 @@ class XmlImporter(object): ...@@ -149,7 +148,6 @@ class XmlImporter(object):
if type(v) is str: if type(v) is str:
setattr(ext, attname, to_python(v, ext, attname)) setattr(ext, attname, to_python(v, ext, attname))
else: else:
print("v is not string, it is", v, type(v))
for attname2, v2 in v.items(): for attname2, v2 in v.items():
obj2 = getattr(ext, attname) obj2 = getattr(ext, attname)
setattr(obj2, attname2, to_python(v2, obj2, attname2)) setattr(obj2, attname2, to_python(v2, obj2, attname2))
...@@ -170,31 +168,6 @@ class XmlImporter(object): ...@@ -170,31 +168,6 @@ class XmlImporter(object):
return [getattr(ua, vtype)(v) for v in obj.value] return [getattr(ua, vtype)(v) for v in obj.value]
else: else:
return ua.Variant(obj.value, getattr(ua.VariantType, obj.valuetype)) return ua.Variant(obj.value, getattr(ua.VariantType, obj.valuetype))
#if obj.valuetype == 'ListOfLocalizedText':
#return ua.Variant([ua.LocalizedText(txt) for txt in obj.value], None)
#elif obj.valuetype == 'ListOfExtension':
#elif obj.valuetype == 'EnumValueType':
#values = []
#for ev in obj.value:
#enum_value = ua.EnumValueType()
#enum_value.DisplayName = ua.LocalizedText(ev['DisplayName'])
#enum_value.Description = ua.LocalizedText(ev['Description'])
#enum_value.Value = int(ev['Value'])
#values.append(enum_value)
#return values
#elif obj.valuetype == 'Argument':
#values = []
#for arg in obj.value:
#argument = ua.Argument()
#argument.Name = arg['Name']
#argument.Description = ua.LocalizedText(arg['Description'])
#argument.DataType = self.to_nodeid(arg['DataType'])
#argument.ValueRank = int(arg['ValueRank'])
#argument.ArrayDimensions = arg['ArrayDimensions']
#values.append(argument)
#return values
#return ua.Variant(obj.value, getattr(ua.VariantType, obj.valuetype))
def add_variable_type(self, obj): def add_variable_type(self, obj):
node = self._get_node(obj) node = self._get_node(obj)
......
...@@ -162,10 +162,6 @@ def create_standard_address_space_%s(server): ...@@ -162,10 +162,6 @@ def create_standard_address_space_%s(server):
print("makeing code for ", extobj.objname) print("makeing code for ", extobj.objname)
self.writecode(indent, 'extobj = ua.{}()'.format(extobj.objname)) self.writecode(indent, 'extobj = ua.{}()'.format(extobj.objname))
for name, val in extobj.body.items(): for name, val in extobj.body.items():
if type(val) is str:
raise Exception("Error val should a dict", name, val)
#self.writecode(indent, 'extobj.{} = "{}"'.format(name, val))
else:
for k, v in val.items(): for k, v in val.items():
if type(v) is str: if type(v) is str:
val = _to_val([extobj.objname], k, v) val = _to_val([extobj.objname], k, v)
...@@ -174,7 +170,6 @@ def create_standard_address_space_%s(server): ...@@ -174,7 +170,6 @@ def create_standard_address_space_%s(server):
if k == "DataType": #hack for strange nodeid xml format if k == "DataType": #hack for strange nodeid xml format
self.writecode(indent, 'extobj.{} = ua.NodeId.from_string("{}")'.format(k, v["Identifier"])) self.writecode(indent, 'extobj.{} = ua.NodeId.from_string("{}")'.format(k, v["Identifier"]))
continue continue
for k2, v2 in v.items(): for k2, v2 in v.items():
val2 = _to_val([extobj.objname, k], k2, v2) val2 = _to_val([extobj.objname, k], k2, v2)
self.writecode(indent, 'extobj.{}.{} = {}'.format(k, k2, val2)) self.writecode(indent, 'extobj.{}.{} = {}'.format(k, k2, val2))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment