innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Normalized the name order of arguments. There's no actual bug here, other than potential confusion for anyone reading the code. Thanks to Aram Dulyan for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-12-04 05:59:38 +00:00
parent 79adb51514
commit 52c77803d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/models/fields/subclassing.py
View File

@ -63,8 +63,8 @@ class LegacyConnection(type):
A metaclass to normalize arguments give to the get_db_prep_* and db_type A metaclass to normalize arguments give to the get_db_prep_* and db_type
methods on fields. methods on fields.
""" """
def __new__(cls, names, bases, attrs): def __new__(cls, name, bases, attrs):
new_cls = super(LegacyConnection, cls).__new__(cls, names, bases, attrs) new_cls = super(LegacyConnection, cls).__new__(cls, name, bases, attrs)
for attr in ('db_type', 'get_db_prep_save'): for attr in ('db_type', 'get_db_prep_save'):
setattr(new_cls, attr, call_with_connection(getattr(new_cls, attr))) setattr(new_cls, attr, call_with_connection(getattr(new_cls, attr)))
for attr in ('get_db_prep_lookup', 'get_db_prep_value'): for attr in ('get_db_prep_lookup', 'get_db_prep_value'):
@ -76,8 +76,8 @@ class SubfieldBase(LegacyConnection):
A metaclass for custom Field subclasses. This ensures the model's attribute A metaclass for custom Field subclasses. This ensures the model's attribute
has the descriptor protocol attached to it. has the descriptor protocol attached to it.
""" """
def __new__(cls, base, name, attrs): def __new__(cls, name, bases, attrs):
new_class = super(SubfieldBase, cls).__new__(cls, base, name, attrs) new_class = super(SubfieldBase, cls).__new__(cls, name, bases, attrs)
new_class.contribute_to_class = make_contrib( new_class.contribute_to_class = make_contrib(
new_class, attrs.get('contribute_to_class') new_class, attrs.get('contribute_to_class')
) )