Browse files

[1.2.X] 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.

Backport of r14796 from trunk.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 81a85a0 commit 3ad1cb7701d6f86de9b565b120da9130017ec31a @freakboy3742 freakboy3742 committed Dec 4, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 django/db/models/fields/
@@ -63,8 +63,8 @@ class LegacyConnection(type):
A metaclass to normalize arguments give to the get_db_prep_* and db_type
methods on fields.
- def __new__(cls, names, bases, attrs):
- new_cls = super(LegacyConnection, cls).__new__(cls, names, bases, attrs)
+ def __new__(cls, name, bases, attrs):
+ new_cls = super(LegacyConnection, cls).__new__(cls, name, bases, attrs)
for attr in ('db_type', 'get_db_prep_save'):
setattr(new_cls, attr, call_with_connection(getattr(new_cls, attr)))
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
has the descriptor protocol attached to it.
- def __new__(cls, base, name, attrs):
- new_class = super(SubfieldBase, cls).__new__(cls, base, name, attrs)
+ def __new__(cls, name, bases, attrs):
+ new_class = super(SubfieldBase, cls).__new__(cls, name, bases, attrs)
new_class.contribute_to_class = make_contrib(
new_class, attrs.get('contribute_to_class')

0 comments on commit 3ad1cb7

Please sign in to comment.