fix deprecation warring with django 1.7

mongoengine/base/document.py

@@ -287,7 +287,8 @@ def get_text_score(self):
         """
 
         if '_text_score' not in self._data:
-            raise InvalidDocumentError('This document is not originally built from a text query')
+            raise InvalidDocumentError(
+                'This document is not originally built from a text query')
 
         return self._data['_text_score']
 
@@ -691,7 +692,8 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=[], created=False):
         if cls.STRICT:
             data = dict((k, v)
                         for k, v in data.iteritems() if k in cls._fields)
-        obj = cls(__auto_convert=False, _created=created, __only_fields=only_fields, **data)
+        obj = cls(__auto_convert=False, _created=created,
+                  __only_fields=only_fields, **data)
         obj._changed_fields = changed_fields
         if not _auto_dereference:
             obj._fields = fields
@@ -746,8 +748,10 @@ def _build_index_spec(cls, spec):
         include_cls = (allow_inheritance and not spec.get('sparse', False) and
                        spec.get('cls',  True))
 
-        # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
-        include_cls = include_cls and (spec.get('cls', False) or cls._meta.get('index_cls', True))
+        # 733: don't include cls if index_cls is False unless there is an
+        # explicit cls with the index
+        include_cls = include_cls and (
+            spec.get('cls', False) or cls._meta.get('index_cls', True))
         if "cls" in spec:
             spec.pop('cls')
         for key in spec['fields']:
@@ -922,7 +926,8 @@ def _lookup_field(cls, parts):
                         if field is not None:
                             break
                     else:
-                        raise LookUpError('Cannot resolve field "%s"' % field_name)
+                        raise LookUpError(
+                            'Cannot resolve field "%s"' % field_name)
                 else:
                     raise LookUpError('Cannot resolve field "%s"'
                                       % field_name)

mongoengine/django/auth.py

@@ -78,14 +78,17 @@ class SiteProfileNotAvailable(Exception):
 
 
 class PermissionManager(models.Manager):
+
     def get_by_natural_key(self, codename, app_label, model):
         return self.get(
             codename=codename,
-            content_type=ContentType.objects.get_by_natural_key(app_label, model)
+            content_type=ContentType.objects.get_by_natural_key(
+                app_label, model)
         )
 
 
 class Permission(Document):
+
     """The permissions system provides a way to assign permissions to specific
     users and groups of users.
 
@@ -110,8 +113,8 @@ class Permission(Document):
     name = StringField(max_length=50, verbose_name=_('username'))
     content_type = ReferenceField(ContentType)
     codename = StringField(max_length=100, verbose_name=_('codename'))
-        # FIXME: don't access field of the other class
-        # unique_with=['content_type__app_label', 'content_type__model'])
+    # FIXME: don't access field of the other class
+    # unique_with=['content_type__app_label', 'content_type__model'])
 
     objects = PermissionManager()
 
@@ -133,6 +136,7 @@ def natural_key(self):
 
 
 class Group(Document):
+
     """Groups are a generic way of categorizing users to apply permissions,
     or some other label, to those users. A user can belong to any number of
     groups.
@@ -149,7 +153,8 @@ class Group(Document):
     e-mail messages.
     """
     name = StringField(max_length=80, unique=True, verbose_name=_('name'))
-    permissions = ListField(ReferenceField(Permission, verbose_name=_('permissions'), required=False))
+    permissions = ListField(
+        ReferenceField(Permission, verbose_name=_('permissions'), required=False))
 
     class Meta:
         verbose_name = _('group')
@@ -160,6 +165,7 @@ def __unicode__(self):
 
 
 class UserManager(models.Manager):
+
     def create_user(self, username, email, password=None):
         """
         Creates and saves a User with the given username, e-mail and password.
@@ -200,6 +206,7 @@ def make_random_password(self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyz
 
 
 class User(Document):
+
     """A User document that aims to mirror most of the API specified by Django
     at http://docs.djangoproject.com/en/dev/topics/auth/#users
     """
@@ -231,7 +238,7 @@ class User(Document):
                                 verbose_name=_('date joined'))
 
     user_permissions = ListField(ReferenceField(Permission), verbose_name=_('user permissions'),
-                                                help_text=_('Permissions for the user.'))
+                                 help_text=_('Permissions for the user.'))
 
     USERNAME_FIELD = 'username'
     REQUIRED_FIELDS = ['email']
@@ -358,23 +365,25 @@ def get_profile(self):
                 app_label, model_name = settings.AUTH_PROFILE_MODULE.split('.')
             except ValueError:
                 raise SiteProfileNotAvailable('app_label and model_name should'
-                        ' be separated by a dot in the AUTH_PROFILE_MODULE set'
-                        'ting')
+                                              ' be separated by a dot in the AUTH_PROFILE_MODULE set'
+                                              'ting')
 
             try:
                 model = models.get_model(app_label, model_name)
                 if model is None:
                     raise SiteProfileNotAvailable('Unable to load the profile '
-                        'model, check AUTH_PROFILE_MODULE in your project sett'
-                        'ings')
-                self._profile_cache = model._default_manager.using(self._state.db).get(user__id__exact=self.id)
+                                                  'model, check AUTH_PROFILE_MODULE in your project sett'
+                                                  'ings')
+                self._profile_cache = model._default_manager.using(
+                    self._state.db).get(user__id__exact=self.id)
                 self._profile_cache.user = self
             except (ImportError, ImproperlyConfigured):
                 raise SiteProfileNotAvailable
         return self._profile_cache
 
 
 class MongoEngineBackend(object):
+
     """Authenticate using MongoEngine and mongoengine.django.auth.User.
     """
 
@@ -388,7 +397,8 @@ def authenticate(self, username=None, password=None):
         if user:
             if password and user.check_password(password):
                 backend = auth.get_backends()[0]
-                user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__)
+                user.backend = "%s.%s" % (
+                    backend.__module__, backend.__class__.__name__)
                 return user
         return None
 
@@ -402,6 +412,7 @@ def user_document(self):
             self._user_doc = get_user_document()
         return self._user_doc
 
+
 def get_user(userid):
     """Returns a User object from an id (User.id). Django's equivalent takes
     request, but taking an id instead leaves it up to the developer to store

mongoengine/django/mongo_auth/models.py

@@ -90,9 +90,12 @@ def db(self):
     def get_empty_query_set(self):
         return self.model.objects.none()
 
-    def get_query_set(self):
+    def get_queryset(self):
         return self.model.objects
 
+    def get_query_set(self):
+        return self.get_queryset()
+
 
 class MongoUser(models.Model):
     """"Dummy user model for Django.