Fixed #19576 -- Use six.with_metaclass uniformously accross code base.

django · Jan 8, 2013 · f58efd0 · f58efd0
1 parent 55da775
commit f58efd0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/django/db/models/base.py b/django/db/models/base.py
@@ -311,7 +311,7 @@ def __init__(self, db=None):
         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
@@ -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