Changeset 8370

Timestamp:

6 May 2012, 13:18:17 (13 years ago)

Author:

uli

Message:

Fix iface_names().

File:

• main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py

@@ -496 +496 @@
     Returns an unsorted list of strings.
     """
-    ifaces = [iface] + list(iface.getBases())
-    names = []
-    for item in ifaces:
-        names += item.names()
-    names = [x for x in names if x not in omit]
+    ifaces = set((iface,))
+    # Collect all interfaces (also bases) recursively
+    while True:
+        ext_ifaces = set(ifaces)
+        for iface in ext_ifaces:
+            ext_ifaces = set.union(ext_ifaces, set(iface.getBases()))
+        if ext_ifaces == ifaces:
+            # No new interfaces found, list complete
+            break
+        ifaces = ext_ifaces
+    # Collect (filtered) names of collected interfaces
     result = []
-    for name in names:
-        cls = iface.get(name).__class__
-        if exclude_attribs and cls is Attribute:
-            continue
-        if exclude_methods and cls is Method:
-            continue
-        result.append(name)
+    for iface in ifaces:
+        for name, descr in iface.namesAndDescriptions():
+            if name in omit:
+                continue
+            if exclude_attribs and descr.__class__ is Attribute:
+                continue
+            if exclude_methods and isinstance(descr, Method):
+                continue
+            result.append(name)
     return result