Cleaned up some user compatibility shims for old Django versions.

Author: timgraham

cms/admin/change_list.py

@@ -7,7 +7,7 @@
 from django.contrib.admin.views.main import ChangeList, ALL_VAR, IS_POPUP_VAR, \
     ORDER_TYPE_VAR, ORDER_VAR, SEARCH_VAR
 from django.contrib.sites.models import Site
-import django
+
 
 COPY_VAR = "copy"
 
@@ -58,25 +58,21 @@ def __init__(self, request, *args, **kwargs):
             request.session['cms_admin_site'] = self._current_site.pk
         self.set_sites(request)
 
-    def get_queryset(self, request=None):
+    def get_queryset(self, request):
         if COPY_VAR in self.params:
             del self.params[COPY_VAR]
         if 'language' in self.params:
             del self.params['language']
         if 'page_id' in self.params:
             del self.params['page_id']
-        if django.VERSION[1] > 3:
-            qs = super(CMSChangeList, self).get_queryset(request).drafts()
-        else:
-            qs = super(CMSChangeList, self).get_queryset().drafts()
-        if request:
-            site = self.current_site()
-            permissions = Page.permissions.get_change_id_list(request.user, site)
-            if permissions != Page.permissions.GRANT_ALL:
-                qs = qs.filter(pk__in=permissions)
-                self.root_queryset = self.root_queryset.filter(pk__in=permissions)
-            self.real_queryset = True
-            qs = qs.filter(site=self._current_site)
+        qs = super(CMSChangeList, self).get_queryset(request).drafts()
+        site = self.current_site()
+        permissions = Page.permissions.get_change_id_list(request.user, site)
+        if permissions != Page.permissions.GRANT_ALL:
+            qs = qs.filter(pk__in=permissions)
+            self.root_queryset = self.root_queryset.filter(pk__in=permissions)
+        self.real_queryset = True
+        qs = qs.filter(site=self._current_site)
         return qs
 
     def is_filtered(self):

cms/admin/forms.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from django import forms
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
@@ -15,7 +16,7 @@
 from cms.forms.widgets import UserSelectAdminWidget, AppHookSelect
 from cms.models import Page, PagePermission, PageUser, ACCESS_PAGE, PageUserGroup, Title, EmptyTitle, \
     GlobalPagePermission
-from cms.utils.compat.dj import get_user_model, force_unicode
+from cms.utils.compat.dj import force_unicode
 from cms.utils.compat.forms import UserCreationForm
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_tuple

cms/admin/permissionadmin.py

@@ -2,13 +2,13 @@
 from copy import deepcopy
 from django.contrib import admin
 from django.contrib.admin import site
+from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext as _
 
 from cms.admin.forms import GlobalPagePermissionAdminForm, PagePermissionInlineAdminForm, ViewRestrictionInlineAdminForm
 from cms.exceptions import NoPermissionsException
 from cms.models import Page, PagePermission, GlobalPagePermission, PageUser
-from cms.utils.compat.dj import get_user_model
 from cms.utils.conf import get_cms_setting
 from cms.utils.helpers import classproperty
 from cms.utils.permissions import get_user_permission_level

cms/admin/useradmin.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
+from django.contrib.auth import get_user_model
 
 from cms.admin.forms import PageUserForm, PageUserGroupForm
 from cms.admin.permissionadmin import GenericCmsPermissionAdmin
 from cms.exceptions import NoPermissionsException
 from cms.models import PageUser, PageUserGroup
-from cms.utils.compat.dj import get_user_model
 from cms.utils.compat.forms import UserAdmin
 from cms.utils.conf import get_cms_setting
 from cms.utils.permissions import get_subordinate_users

cms/api.py

@@ -8,13 +8,15 @@
 """
 import datetime
 
+from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site
 from django.core.exceptions import FieldError
 from django.core.exceptions import PermissionDenied
 from django.core.exceptions import ValidationError
 from django.template.defaultfilters import slugify
 from django.template.loader import get_template
 from django.utils import six
+
 from cms.admin.forms import save_permissions
 from cms.app_base import CMSApp
 from cms.apphook_pool import apphook_pool
@@ -28,7 +30,6 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 from cms.utils import copy_plugins
-from cms.utils.compat.dj import get_user_model
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_list
 from cms.utils.permissions import _thread_locals

cms/cache/permissions.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+from django.contrib.auth import get_user_model
+
 from cms.utils import get_cms_setting
-from cms.utils.compat.dj import get_user_model
 
 
 PERMISSION_KEYS = [

cms/management/commands/publisher_publish.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from optparse import make_option
+
+from django.contrib.auth import get_user_model
 from django.core.management.base import NoArgsCommand, CommandError
 from django.utils.translation import activate
+
 from cms.utils.compat.dj import force_unicode
 
 class Command(NoArgsCommand):
@@ -44,7 +47,6 @@ def handle_noargs(self, **options):
 
     def publish_pages(self, include_unpublished, language, site):
         from cms.models import Page
-        from cms.utils.compat.dj import get_user_model
         from cms.utils.permissions import set_current_user
 
         # thread locals middleware needs to know, who are we - login as a first

cms/menu.py

@@ -12,7 +12,6 @@
 from cms.models.permissionmodels import ACCESS_PAGE
 from cms.models.permissionmodels import PagePermission, GlobalPagePermission
 from cms.utils import get_language_from_request
-from cms.utils.compat.dj import user_related_name
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_fallback_languages, hide_untranslated
 from cms.utils.page_resolver import get_page_queryset
@@ -37,7 +36,7 @@ def get_visible_pages(request, pages, site=None):
     visible_page_ids = []
     restricted_pages = defaultdict(list)
     page_permissions = PagePermission.objects.filter(can_view=True).select_related(
-            'page').prefetch_related('group__' + user_related_name)
+            'page').prefetch_related('group__user_set')
 
     for perm in page_permissions:
         # collect the pages that are affected by permissions
@@ -110,7 +109,7 @@ def has_permission_membership(page):
                 return True
             if not perm.group_id:
                 continue
-            user_set = getattr(perm.group, user_related_name)
+            user_set = getattr(perm.group, 'user_set')
             # Optimization equivalent to
             # if user_pk in user_set.values_list('pk', flat=True)
             if any(user_pk == user.pk for user in user_set.all()):

cms/models/managers.py

@@ -9,7 +9,6 @@
 from cms.models.query import PageQuerySet
 from cms.publisher import PublisherManager
 from cms.utils import get_cms_setting
-from cms.utils.compat.dj import user_related_query_name
 from cms.utils.i18n import get_fallback_languages
 
 
@@ -181,10 +180,7 @@ def with_user(self, user):
         """Get all objects for given user, also takes look if user is in some
         group.
         """
-        query = dict()
-        query['group__' + user_related_query_name] = user
-
-        return self.filter(Q(user=user) | Q(**query))
+        return self.filter(Q(user=user) | Q(group__user=user))
 
     def with_can_change_permissions(self, user):
         """Set of objects on which user haves can_change_permissions. !But only

cms/signals/permissions.py

@@ -2,7 +2,6 @@
 
 from cms.cache.permissions import clear_user_permission_cache
 from cms.models import PageUser, PageUserGroup
-from cms.utils.compat.dj import user_related_name
 from menus.menu_pool import menu_pool
 
 
@@ -52,13 +51,13 @@ def pre_delete_user(instance, **kwargs):
 
 def pre_save_group(instance, raw, **kwargs):
     if instance.pk:
-        user_set = getattr(instance, user_related_name)
+        user_set = getattr(instance, 'user_set')
         for user in user_set.all():
             clear_user_permission_cache(user)
 
 
 def pre_delete_group(instance, **kwargs):
-    user_set = getattr(instance, user_related_name)
+    user_set = getattr(instance, 'user_set')
     for user in user_set.all():
         clear_user_permission_cache(user)
 
@@ -67,7 +66,7 @@ def _clear_users_permissions(instance):
     if instance.user:
         clear_user_permission_cache(instance.user)
     if instance.group:
-        user_set = getattr(instance.group, user_related_name)
+        user_set = getattr(instance.group, 'user_set')
         for user in user_set.all():
             clear_user_permission_cache(user)
 

cms/test_utils/project/customuserapp/admin.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
+from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin as OriginalUserAdmin
 from django.contrib.auth.models import User as OriginalUser
-from cms.utils.compat.dj import get_user_model
 
 
 if getattr(OriginalUser._meta, 'swapped', False):

cms/test_utils/project/emailuserapp/forms.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
+from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from cms.utils.compat.dj import get_user_model
 
 from .models import EmailUser
 

cms/test_utils/testcases.py

@@ -4,6 +4,7 @@
 import warnings
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.sites.models import Site
 from django.core.cache import cache
@@ -17,7 +18,6 @@
 
 from cms.models import Page
 from cms.test_utils.util.context_managers import UserLoginContext
-from cms.utils.compat.dj import get_user_model
 from cms.utils.compat.urls import urljoin, unquote
 from cms.utils.permissions import set_current_user
 

cms/test_utils/util/context_managers.py

@@ -5,13 +5,12 @@
 from tempfile import template, mkdtemp
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core.signals import request_started
 from django.db import reset_queries
 from django.utils.six.moves import StringIO
 from django.utils.translation import get_language, activate
 
-from cms.utils.compat.dj import get_user_model
-
 
 class NULL:
     pass

cms/tests/admin.py

@@ -10,6 +10,7 @@
 from django.contrib import admin
 from django.contrib.admin.models import LogEntry
 from django.contrib.admin.sites import site
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission, AnonymousUser
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
@@ -36,7 +37,7 @@
 from cms.test_utils.util.fuzzy_int import FuzzyInt
 from cms.utils import get_cms_setting
 from cms.utils.compat import DJANGO_1_6
-from cms.utils.compat.dj import get_user_model, force_unicode
+from cms.utils.compat.dj import force_unicode
 
 
 class AdminTestsBase(CMSTestCase):

cms/tests/api.py

@@ -1,6 +1,7 @@
 from __future__ import with_statement
 import sys
 
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError
@@ -18,7 +19,6 @@
 from cms.test_utils.util.menu_extender import TestMenu
 from cms.test_utils.util.mock import AttributeObject
 from cms.tests.apphooks import APP_MODULE, APP_NAME
-from cms.utils.compat.dj import get_user_model
 
 
 def _grant_page_permission(user, codename):

cms/tests/apphooks.py

@@ -2,6 +2,7 @@
 from __future__ import with_statement
 import sys
 
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import clear_url_caches, reverse
 from django.test.utils import override_settings
 from django.utils import six
@@ -17,7 +18,6 @@
 from cms.test_utils.testcases import CMSTestCase
 from cms.tests.menu_utils import DumbPageLanguageUrl
 from cms.toolbar.toolbar import CMSToolbar
-from cms.utils.compat.dj import get_user_model
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import force_language
 from menus.utils import DefaultLanguageChanger

cms/tests/extensions.py

@@ -2,6 +2,7 @@
 from cms.extensions.toolbar import ExtensionToolbar
 from cms.toolbar_pool import toolbar_pool
 from cms.utils.urlutils import admin_reverse
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.contrib.sites.models import Site
 
@@ -15,7 +16,6 @@
                                                         MyTitleExtension)
 from cms.test_utils.testcases import CMSTestCase as TestCase
 from cms.tests import AdminTestsBase
-from cms.utils.compat.dj import get_user_model
 
 
 class ExtensionsTestCase(TestCase):

cms/tests/forms.py

@@ -4,6 +4,7 @@
 
 from cms.models import ACCESS_PAGE, ACCESS_PAGE_AND_CHILDREN
 from cms.utils.permissions import set_current_user
+from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site
 from django.core.cache import cache
 from cms.admin import forms
@@ -14,7 +15,6 @@
 from cms.forms.utils import (get_site_choices, get_page_choices,
     update_site_and_page_choices)
 from cms.test_utils.testcases import CMSTestCase
-from cms.utils.compat.dj import get_user_model
 
 
 class Mock_PageSelectFormField(PageSelectFormField):

cms/tests/frontend.py

@@ -4,6 +4,7 @@
 import os
 import time
 
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.contrib.sites.models import Site
 from django.core.cache import cache
@@ -26,7 +27,6 @@
 from cms.test_utils.project.placeholderapp.models import Example1
 from cms.test_utils.testcases import CMSTestCase
 from cms.utils.compat import DJANGO_1_6
-from cms.utils.compat.dj import get_user_model
 from cms.utils.conf import get_cms_setting
 
 if DJANGO_1_6:

cms/tests/mail.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
+from django.contrib.auth import get_user_model
 from django.core import mail
 
 from cms.api import create_page_user
 from cms.test_utils.testcases import CMSTestCase
-from cms.utils.compat.dj import get_user_model
 from cms.utils.mail import mail_page_user_change