From 78739faedb01baee06e84c69f6fab84c9e8b718e Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Mon, 7 Jan 2013 23:41:59 -0500 Subject: [PATCH] [1.5.x] Fixed #19576 -- Use `six.with_metaclass` uniformously accross code base. Backport of f58efd07f from master. --- django/db/models/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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):