Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit f58efd07ff2b2edb377d02567615e79e8d05248b 1 parent 55da775
Simon Charette authored January 07, 2013 claudep committed January 08, 2013
2  django/db/models/base.py
@@ -311,7 +311,7 @@ def __init__(self, db=None):
311 311
         self.adding = True
312 312
 
313 313
 
314  
-class Model(six.with_metaclass(ModelBase, object)):
  314
+class Model(six.with_metaclass(ModelBase)):
315 315
     _deferred = False
316 316
 
317 317
     def __init__(self, *args, **kwargs):
2  django/db/models/query.py
@@ -990,7 +990,7 @@ class InstanceCheckMeta(type):
990 990
     def __instancecheck__(self, instance):
991 991
         return instance.query.is_empty()
992 992
 
993  
-class EmptyQuerySet(six.with_metaclass(InstanceCheckMeta), object):
  993
+class EmptyQuerySet(six.with_metaclass(InstanceCheckMeta)):
994 994
     """
995 995
     Marker class usable for checking if a queryset is empty by .none():
996 996
         isinstance(qs.none(), EmptyQuerySet) -> True

0 notes on commit f58efd0

Please sign in to comment.
Something went wrong with that request. Please try again.