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:13:43 +0100
commitf58efd07ff2b2edb377d02567615e79e8d05248b (patch)
treee7455137e8bcb924ee05d3f0391d89f1a800b24b
parent55da775ce1bfba20db33b56c29957faa63917980 (diff)
Fixed #19576 -- Use `six.with_metaclass` uniformously accross code base.
-rw-r--r--django/db/models/base.py2
-rw-r--r--django/db/models/query.py2
2 files changed, 2 insertions, 2 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):
diff --git a/django/db/models/query.py b/django/db/models/query.py
index edc8cc9776..bdb6d48adc 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