Fixed set usage in eds_utils
authorLaurent Bessard
Wed, 08 May 2013 09:14:59 +0200
changeset 784 8aefbd0d39ff
parent 783 376563111c55
child 785 b72a88dbc7c3
Fixed set usage in eds_utils
objdictgen/eds_utils.py
--- a/objdictgen/eds_utils.py	Fri May 03 10:18:35 2013 +0200
+++ b/objdictgen/eds_utils.py	Wed May 08 09:14:59 2013 +0200
@@ -379,19 +379,19 @@
             required = set(ENTRY_TYPES[values["OBJECTTYPE"]]["require"])
             # Verify that parameters defined contains all the parameters required
             if not keys.issuperset(required):
-                missing = required.difference(keys)._data.keys()
+                missing = required.difference(keys)
                 if len(missing) > 1:
                     attributes = _("Attributes %s are")%_(", ").join(["\"%s\""%attribute for attribute in missing])
                 else:
-                    attributes = _("Attribute \"%s\" is")%missing[0]
+                    attributes = _("Attribute \"%s\" is")%missing.pop()
                 raise SyntaxError, _("Error on section \"[%s]\":\n%s required for a %s entry")%(section_name, attributes, ENTRY_TYPES[values["OBJECTTYPE"]]["name"])
             # Verify that parameters defined are all in the possible parameters
             if not keys.issubset(possible):
-                unsupported = keys.difference(possible)._data.keys()
+                unsupported = keys.difference(possible)
                 if len(unsupported) > 1:
                     attributes = _("Attributes %s are")%_(", ").join(["\"%s\""%attribute for attribute in unsupported])
                 else:
-                    attributes = _("Attribute \"%s\" is")%unsupported[0]
+                    attributes = _("Attribute \"%s\" is")%unsupported.pop()
                 raise SyntaxError, _("Error on section \"[%s]\":\n%s unsupported for a %s entry")%(section_name, attributes, ENTRY_TYPES[values["OBJECTTYPE"]]["name"])
             
             VerifyValue(values, section_name, "ParameterValue")