Remove deprecated admin.site.root_path references, replace with reverse()

cms/admin/pageadmin.py

@@ -668,13 +668,15 @@ def changelist_view(self, request, extra_context=None):
         else:
             languages = [x[0] for x in settings.CMS_LANGUAGES]
 
+        root_path = reverse('admin:index')
+
         context = {
             'title': cl.title,
             'is_popup': cl.is_popup,
             'cl': cl,
             'opts':opts,
             'has_add_permission': self.has_add_permission(request),
-            'root_path': self.admin_site.root_path,
+            'root_path': root_path,
             'app_label': app_label,
             'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
             'softroot': settings.CMS_SOFTROOT,

cms/utils/mail.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from django.core.mail import EmailMultiAlternatives
+from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 
-from django.contrib import admin
 from django.contrib.sites.models import Site
 
 from cms.utils.urlutils import urljoin
@@ -15,8 +15,10 @@ def send_mail(subject, txt_template, to, context=None, html_template=None, fail_
     site = Site.objects.get_current()
 
     context = context or {}
+
+    root_path = reverse('admin:index')
     context.update({
-        'login_url': "http://%s" % urljoin(site.domain, admin.site.root_path),
+        'login_url': "http://%s" % urljoin(site.domain, root_path),
         'title': subject,
     })
 

cms/utils/moderator.py

@@ -241,18 +241,21 @@ def mail_approvement_request(page, user=None):
     if not recipient_list:
         return
 
-    from django.contrib import admin
     from django.contrib.sites.models import Site
     from cms.utils.urlutils import urljoin
     from cms.utils.mail import send_mail
+    from django.core.urlresolvers import reverse
+
 
     site = Site.objects.get_current()
 
     subject = _('CMS - Page %s requires approvement.') % unicode(page)
+    root_path = reverse('admin:index')
+    assert False, root_path
 
     context = {
         'page': page,
-        'admin_url': "http://%s" % urljoin(site.domain, admin.site.root_path, 'cms/page', page.id),
+        'admin_url': "http://%s" % urljoin(site.domain, root_path, 'cms/page', page.id),
     }
 
     send_mail(subject, 'admin/cms/mail/approvement_required.txt', recipient_list, context, 'admin/cms/mail/approvement_required.html')