compound_key was ignoring key for RepeatingWidget

tests/test_widgets.py

@@ -589,6 +589,15 @@ class T(wd.RepeatingWidget):
             children = [wd.Widget(id="foo")]
         self.assert_(len(T().req().child.children) == 1)
 
+    def testRepeatingWithKeyDifferentFromId(self):
+        class T(wd.RepeatingWidget):
+            id = 'foo'
+            key = 'bar'
+            child = wd.Widget
+
+        w = T().req(value=['1', '2', '3'])
+        self.assertEquals(w.children[0].compound_key, 'bar:0')
+
     def testNonWidgetChild(self):
         """
         should throw an error if child is not a widget

tw2/core/widgets.py

@@ -257,7 +257,7 @@ def post_define(cls):
                     setattr(cls, p.name, p.default)
 
     @classmethod
-    def _gen_compound_id(cls, for_url):
+    def _gen_compound_name(cls, attr, for_url):
         ancestors = []
         cur = cls
         while cur:
@@ -266,34 +266,35 @@ def _gen_compound_id(cls, for_url):
             ancestors.append(cur)
             cur = cur.parent
         elems = reversed(list(filter(None, [
-            a._compound_id_elem(for_url) for a in ancestors
+            a._compound_name_elem(attr, for_url) for a in ancestors
         ])))
-        if getattr(cls, 'id', None) or \
+        if getattr(cls, attr, None) or \
            (cls.parent and issubclass(cls.parent, RepeatingWidget)):
             return ':'.join(elems)
         else:
             return None
 
     @classmethod
-    def _compound_id_elem(cls, for_url):
+    def _compound_name_elem(cls, attr, for_url):
         if cls.parent and issubclass(cls.parent, RepeatingWidget):
             if for_url:
                 return None
             else:
                 return str(getattr(cls, 'repetition', None))
         else:
-            return getattr(cls, 'id', None)
+            return getattr(cls, attr, None)
 
     @classmethod
-    def _gen_compound_key(cls):
-        if not cls.key:
-            return cls.compound_id
+    def _compound_id_elem(cls, for_url):
+        return cls._compound_name_elem('id', for_url)
 
-        parent_key = getattr(cls.parent, 'compound_key', None)
-        if parent_key:
-            return ':'.join([parent_key, cls.key])
-        else:
-            return cls.key
+    @classmethod
+    def _gen_compound_id(cls, for_url):
+        return cls._gen_compound_name('id', for_url)
+
+    @classmethod
+    def _gen_compound_key(cls):
+        return cls._gen_compound_name('key', False)
 
     @classmethod
     def get_link(cls):