Changeset 2551 for trunk/packages/invirt-base

Timestamp:

Nov 22, 2009, 4:07:29 PM (15 years ago)

Author:

broder

Message:

Add an iter method to invirt.common.struct.

File:

• trunk/packages/invirt-base/python/invirt/common.py (modified) (3 diffs)

trunk/packages/invirt-base/python/invirt/common.py

@@ -13 +13 @@
     def __init__(self, d = {}, __prefix = None, **kwargs):
         'd is the dictionary or the items-iterable to update my __dict__ with.'
-        self.__dict__.update(d)
-        self.__dict__.update(kwargs)
+        dct = {}
+        dct.update(d)
+        dct.update(kwargs)
+        self.__dict__.update(dct)
+        self.__keys = set(dct)
         self.__prefix = __prefix
     def __getattr__(self, key):
@@ -25 +28 @@
             raise AttributeError("anonymous struct has no member '%s'"
                                  % (key,))
+    def __iter__(self):
+        for i in self.__keys:
+            yield i
 
 def dicts2struct(x, prefix = None):
@@ -119 +125 @@
         self.assertEqual(structs.list[0],     dicts['list'][0])
         self.assertEqual(structs.list[1].key, dicts['list'][1]['key'])
+        self.assertEqual(set(structs), set(['atom', 'dict', 'list']))
 
 if __name__ == '__main__':