Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 8acc6048e8fe17e1ba7e9df30aace2ef84d68276 1 parent 64c0ae5
Jacob Kaplan-Moss authored

Showing 1 changed file with 2 additions and 3 deletions. Show diff stats Hide diff stats

  1. 5  django/core/meta.py
5  django/core/meta.py
@@ -2068,7 +2068,6 @@ def __init__(self, to, **kwargs):
2068 2068
             num_in_admin=kwargs.pop('num_in_admin', 0),
2069 2069
             related_name=kwargs.pop('related_name', None),
2070 2070
             filter_interface=kwargs.pop('filter_interface', None),
2071  
-            get_choices_from=kwargs.pop('get_choices_from', None),
2072 2071
             limit_choices_to=kwargs.pop('limit_choices_to', None))
2073 2072
         Field.__init__(self, **kwargs)
2074 2073
 
@@ -2124,11 +2123,11 @@ def get_related_field(self):
2124 2123
 
2125 2124
 class ManyToMany:
2126 2125
     def __init__(self, to, name, num_in_admin=0, related_name=None,
2127  
-        filter_interface=None, get_choices_from=None, limit_choices_to=None):
  2126
+        filter_interface=None, limit_choices_to=None):
2128 2127
         self.to, self.name = to._meta, name
2129 2128
         self.num_in_admin = num_in_admin
2130 2129
         self.related_name = related_name
2131  
-        self.filter_interface, self.get_choices_from = filter_interface, get_choices_from
  2130
+        self.filter_interface = filter_interface
2132 2131
         self.limit_choices_to = limit_choices_to or {}
2133 2132
         self.edit_inline = False
2134 2133
 

0 notes on commit 8acc604

Please sign in to comment.
Something went wrong with that request. Please try again.