Permalink
Browse files

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

  • Loading branch information...
1 parent 55da775 commit f58efd07ff2b2edb377d02567615e79e8d05248b @charettes charettes committed with claudep Jan 8, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 django/db/models/base.py
  2. +1 −1 django/db/models/query.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):
@@ -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

0 comments on commit f58efd0

Please sign in to comment.