Commit 3ad1cb77 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Normalized the name order of arguments. There's no actual bug here,... 

[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: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 81a85a0c

django/db/models/fields/subclassing.py

+4 −4
Original line number Diff line number Diff line
@@ -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')

        )