Ticket #2445: choices_func.2.diff

django/db/models/base.py

@@ -163 +163 @@
-                val = field.get_default()
-            setattr(self, field.attname, val)
-
+        for item in dir(self):
+            if item.startswith('choices_for__'):
+                choice_func = getattr(self,item)
+                if callable(choice_func):
+                    field_name = choice_func.__name__[len('choices_for__'):]
+                    self._meta.get_field(field_name)._choices = choice_func
+        
-        if kwargs:
-            for prop in kwargs.keys():
-                try:

django/db/models/fields/__init__.py

@@ -8 +8 @@
-
-from django.db import get_creation_module
-from django.db.models import signals
+import django.db.models.query
-from django.dispatch import dispatcher
-from django.conf import settings
-from django.core import validators
@@ -340 +341 @@
-        "Returns a list of tuples used as SelectField choices for this field."
-        first_choice = include_blank and blank_choice or []
-        if self.choices:
-
+
+
+
+
+
+
+
+
+
-        rel_model = self.rel.to
-        if hasattr(self.rel, 'get_related_field'):
-            lst = [(getattr(x, self.rel.get_related_field().attname), smart_unicode(x)) for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]