Removed the vestigal get_choices_from from ManyToMany relations.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@64 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 3 deletions

diff --git a/django/core/meta.py b/django/core/meta.py
index e52a7900e0..36488bbe4c 100644
--- a/django/core/meta.py
+++ b/django/core/meta.py
@@ -2068,7 +2068,6 @@ class ManyToManyField(Field):
             num_in_admin=kwargs.pop('num_in_admin', 0),
             related_name=kwargs.pop('related_name', None),
             filter_interface=kwargs.pop('filter_interface', None),
-            get_choices_from=kwargs.pop('get_choices_from', None),
             limit_choices_to=kwargs.pop('limit_choices_to', None))
         Field.__init__(self, **kwargs)
 
@@ -2124,11 +2123,11 @@ class ManyToOne:
 
 class ManyToMany:
     def __init__(self, to, name, num_in_admin=0, related_name=None,
-        filter_interface=None, get_choices_from=None, limit_choices_to=None):
+        filter_interface=None, limit_choices_to=None):
         self.to, self.name = to._meta, name
         self.num_in_admin = num_in_admin
         self.related_name = related_name
-        self.filter_interface, self.get_choices_from = filter_interface, get_choices_from
+        self.filter_interface = filter_interface
         self.limit_choices_to = limit_choices_to or {}
         self.edit_inline = False