Commit 478a6931 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[py3] Fixed uses of __metaclass__ in tests.

parent 450c0df6

tests/modeltests/custom_pk/fields.py

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ class MyWrapper(object): 
            return self.value == other.value

        return self.value == other



class MyAutoField(models.CharField):

    __metaclass__ = models.SubfieldBase

class MyAutoField(six.with_metaclass(models.SubfieldBase, models.CharField)):



    def __init__(self, *args, **kwargs):

        kwargs['max_length'] = 10

tests/modeltests/field_subclassing/fields.py

+2 −4
Original line number Diff line number Diff line
@@ -20,13 +20,12 @@ class Small(object): 
    def __str__(self):

        return '%s%s' % (force_text(self.first), force_text(self.second))



class SmallField(models.Field):

class SmallField(six.with_metaclass(models.SubfieldBase, models.Field)):

    """

    Turns the "Small" class into a Django field. Because of the similarities

    with normal character fields and the fact that Small.__unicode__ does

    something sensible, we don't need to implement a lot here.

    """

    __metaclass__ = models.SubfieldBase



    def __init__(self, *args, **kwargs):

        kwargs['max_length'] = 2
@@ -56,8 +55,7 @@ class SmallerField(SmallField): 
    pass





class JSONField(models.TextField):

    __metaclass__ = models.SubfieldBase

class JSONField(six.with_metaclass(models.SubfieldBase, models.TextField)):



    description = ("JSONField automatically serializes and desializes values to "

        "and from JSON.")

tests/modeltests/serializers/models.py

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ class Team(object): 
        return "%s" % self.title





class TeamField(models.CharField):

    __metaclass__ = models.SubfieldBase

class TeamField(six.with_metaclass(models.SubfieldBase, models.CharField)):



    def __init__(self):

        super(TeamField, self).__init__(max_length=100)

tests/regressiontests/introspection/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ from functools import update_wrapper 


from django.db import connection

from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature

from django.utils import six



from .models import Reporter, Article
@@ -35,8 +36,7 @@ class IgnoreNotimplementedError(type): 
                attrs[k] = ignore_not_implemented(v)

        return type.__new__(cls, name, bases, attrs)



class IntrospectionTests(TestCase):

    __metaclass__ = IgnoreNotimplementedError

class IntrospectionTests(six.with_metaclass(IgnoreNotimplementedError, TestCase)):



    def test_table_names(self):

        tl = connection.introspection.table_names()

tests/regressiontests/model_forms_regress/tests.py

+2 −3
Original line number Diff line number Diff line
@@ -485,9 +485,8 @@ class CustomMetaclass(ModelFormMetaclass): 
        new.base_fields = {}

        return new



class CustomMetaclassForm(forms.ModelForm):

    __metaclass__ = CustomMetaclass



class CustomMetaclassForm(six.with_metaclass(CustomMetaclass, forms.ModelForm)):

    pass



class CustomMetaclassTestCase(TestCase):

    def test_modelform_factory_metaclass(self):