Commit 9891e770 authored by Alexander Schrode's avatar Alexander Schrode Committed by oroulet

Fix enum regression

parent 34e5aab0
......@@ -588,10 +588,9 @@ def create_enum_deserializer(uatype):
typename = 'UInt32'
if hasattr(uatype, 'datatype'):
typename = uatype.datatype()
return getattr(Primitives, typename).unpack
elif isinstance(uatype, Enum):
return lambda val: Primitives.Int32.unpack(val.value)
return Primitives.Int32.unpack
unpack = getattr(Primitives, typename).unpack
return lambda val: uatype(unpack(val))
return lambda val: uatype(Primitives.Int32.unpack(val))
def from_binary(uatype, data):
......
......@@ -1351,6 +1351,7 @@ async def test_custom_struct_with_enum(opc):
var = await opc.opc.nodes.objects.add_variable(idx, "my_struct2", ua.Variant(mystruct, ua.VariantType.ExtensionObject))
val = await var.read_value()
assert val.MyEnum == ua.MyCustEnum2.tutu
assert isinstance(val.MyEnum, ua.MyCustEnum2)
async def test_nested_struct_arrays(opc):
......
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