Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit f58efd07ff2b2edb377d02567615e79e8d05248b 1 parent 55da775
Simon Charette charettes authored claudep committed
Showing with 2 additions and 2 deletions.
  1. +1 −1  django/db/models/base.py
  2. +1 −1  django/db/models/query.py
2  django/db/models/base.py
View
@@ -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):
2  django/db/models/query.py
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.