Ticket #2593: manipulator_override_global.patch

django/db/models/options.py

@@ -138 +138 @@
 
     def get_follow(self, override=None):
         follow = {}
+        if override:
+            default_override = override.get('*', None)
         for f in self.fields + self.many_to_many + self.get_all_related_objects():
-            if override and override.has_key(f.name):
-                child_override = override[f.name]
+            if override:
+                child_override = override.get(f.name, default_override)
             else:
                 child_override = None
             fol = f.get_follow(child_override)