diff options
| author | Simon Charette <charettes@users.noreply.github.com> | 2017-01-19 02:39:46 -0500 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-19 08:39:46 +0100 |
| commit | cecc079168e8669138728d31611ff3a1e7eb3a9f (patch) | |
| tree | 2415083d44f84c6f206930fc689a8c0e50a98caa /tests/model_inheritance | |
| parent | a5563963397aeee30c32e3c1dab31bfe453ca89f (diff) | |
| download | django-cecc079168e8669138728d31611ff3a1e7eb3a9f.tar.gz | |
Refs #23919 -- Stopped inheriting from object to define new style classes.
Diffstat (limited to 'tests/model_inheritance')
| -rw-r--r-- | tests/model_inheritance/models.py | 2 | ||||
| -rw-r--r-- | tests/model_inheritance/test_abstract_inheritance.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/model_inheritance/models.py b/tests/model_inheritance/models.py index 44bf752d00..62003f032e 100644 --- a/tests/model_inheritance/models.py +++ b/tests/model_inheritance/models.py @@ -157,7 +157,7 @@ class NamedURL(models.Model): abstract = True -class Mixin(object): +class Mixin: def __init__(self): self.other_attr = 1 super(Mixin, self).__init__() diff --git a/tests/model_inheritance/test_abstract_inheritance.py b/tests/model_inheritance/test_abstract_inheritance.py index 6f0b89128b..d74cae7a3b 100644 --- a/tests/model_inheritance/test_abstract_inheritance.py +++ b/tests/model_inheritance/test_abstract_inheritance.py @@ -301,10 +301,10 @@ class AbstractInheritanceTests(TestCase): class Meta: abstract = True - class Mixin(object): + class Mixin: age = None - class Mixin2(object): + class Mixin2: age = 2 class DescendantMixin(Mixin): |