if Value.startswith('GUID') and Value.endswith(')'):\r
Value = Value.split('(', 1)[1][:-1].strip()\r
if Value[0] == '{' and Value[-1] == '}':\r
- Value = Value[1:-1].strip()\r
- Value = Value.split('{', 1)\r
- Value = ['%02x' % int(Item, 16) for Item in (Value[0] + Value[1][:-1]).split(',')]\r
- if len(Value[0]) != 8:\r
- Value[0] = '%08X' % int(Value[0], 16)\r
- if len(Value[1]) != 4:\r
- Value[1] = '%04X' % int(Value[1], 16)\r
- if len(Value[2]) != 4:\r
- Value[2] = '%04X' % int(Value[2], 16)\r
- Value = '-'.join(Value[0:3]) + '-' + ''.join(Value[3:5]) + '-' + ''.join(Value[5:11])\r
+ TmpValue = GuidStructureStringToGuidString(Value)\r
+ if len(TmpValue) == 0:\r
+ raise BadExpression("Invalid GUID value string %s" % Value)\r
+ Value = TmpValue\r
if Value[0] == '"' and Value[-1] == '"':\r
Value = Value[1:-1]\r
try:\r