From f58efd07ff2b2edb377d02567615e79e8d05248b Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Mon, 7 Jan 2013 23:41:59 -0500 Subject: [PATCH] Fixed #19576 -- Use `six.with_metaclass` uniformously accross code base. --- django/db/models/base.py | 2 +- django/db/models/query.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index bd638e24990..38afc609916 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): diff --git a/django/db/models/query.py b/django/db/models/query.py index edc8cc9776e..bdb6d48adcd 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -990,7 +990,7 @@ class InstanceCheckMeta(type): def __instancecheck__(self, instance): return instance.query.is_empty() -class EmptyQuerySet(six.with_metaclass(InstanceCheckMeta), object): +class EmptyQuerySet(six.with_metaclass(InstanceCheckMeta)): """ Marker class usable for checking if a queryset is empty by .none(): isinstance(qs.none(), EmptyQuerySet) -> True