Ticket #10061: t10061-r11201.patch1.diff

django/contrib/admin/sites.py

@@ -3 +3 @@
 from django.contrib.admin import ModelAdmin
 from django.contrib.admin import actions
 from django.contrib.auth import authenticate, login
-from django.db.models.base import ModelBase
 from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import reverse
+from django.db.models.base import ModelBase
 from django.shortcuts import render_to_response
 from django.utils.functional import update_wrapper
 from django.utils.safestring import mark_safe

django/contrib/admindocs/views.py

@@ -24 +24 @@
 def get_root_path():
     from django.contrib import admin
     try:
-        return urlresolvers.reverse(admin.site.root, args=[''])
+        return urlresolvers.reverse('admin:index')
     except urlresolvers.NoReverseMatch:
         return getattr(settings, "ADMIN_SITE_ROOT_URL", "/admin/")
 

django/core/urlresolvers.py

@@ -294 +294 @@
     return get_resolver(urlconf).resolve(path)
 
 def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, app_name=None):
-    print "REVERSE",viewname,app_name
     parts = viewname.split(':')
     parts.reverse()
     view = parts[0]