Refactor Collection.get_field to remove duplication.

ish · May 11, 2011 · f78281d · f78281d
1 parent daef745
commit f78281d
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/formish/forms.py b/formish/forms.py
@@ -550,22 +550,25 @@ def widget(self):
     def get_field(self, name):
         """ recursively get dotted field names """
         segments = name.split('.')
-        # Bind '*' to a fake field.
         if segments[0] == '*':
-            b = self.bind('*', self.attr)
+            # Bind '*' to a fake field.
-            if len(segments) == 1:
+            field = self.bind('*', self.attr)
-                return b
+        else:
+            # Find named field.
+            for field in self.fields:
+                if field.name.split('.')[-1] == segments[0]:
+                    break
             else:
-                return b.get_field('.'.join(segments[1:]))
+                field = None
-        # Find the field in the segments.
+        # Raise a nice error if the field was not found.
-        for field in self.fields:
+        if not field:
-            if field.name.split('.')[-1] == segments[0]:
+            raise KeyError('%s %r has no field %r' % (self.__class__.__name__,
-                if len(segments) == 1:
+                                                      self.name, segments[0]))
-                    return field
+        # Return field or recurse.
-                else:
+        if len(segments) == 1:
-                    return field.get_field(''.join(segments[1:]))
+            return field
-        raise KeyError('%s %r has no field %r' % (self.__class__.__name__,
+        else:
-                                                  self.name, segments[0]))
+            return field.get_field('.'.join(segments[1:]))
 
 
     def __getitem__(self, key):