summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2013-01-07 23:41:59 -0500
committerClaude Paroz <claude@2xlibre.net>2013-01-08 20:16:14 +0100
commit78739faedb01baee06e84c69f6fab84c9e8b718e (patch)
tree20711dd49b61abf5bfdcde622c21a65337012871
parent9d6d0de7c1704fa39efb1f725bd8f80961ce3496 (diff)
[1.5.x] Fixed #19576 -- Use `six.with_metaclass` uniformously accross code base.
Backport of f58efd07f from master.
-rw-r--r--django/db/models/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index bd638e2499..38afc60991 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -311,7 +311,7 @@ class ModelState(object):
self.adding = True
-class Model(six.with_metaclass(ModelBase, object)):
+class Model(six.with_metaclass(ModelBase)):
_deferred = False
def __init__(self, *args, **kwargs):