From 9c2252207905be60a8a8004cb6f7a6b1dd9913e5 Mon Sep 17 00:00:00 2001
From: Mike Bryant <m@ocado.com>
Date: Wed, 21 Dec 2016 17:11:11 +0000
Subject: [PATCH] Fix django.contrib.admin urls on Django 1.10. Fixes #37

---
 django_autoconfig/contrib/admin/urls.py         |  4 ++--
 .../tests/app_contrib_admin/__init__.py         |  0
 .../tests/app_contrib_admin/autoconfig.py       |  5 +++++
 django_autoconfig/tests/test_autoconfig.py      | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 django_autoconfig/tests/app_contrib_admin/__init__.py
 create mode 100644 django_autoconfig/tests/app_contrib_admin/autoconfig.py

diff --git a/django_autoconfig/contrib/admin/urls.py b/django_autoconfig/contrib/admin/urls.py
index a8c631b..563eb3d 100644
--- a/django_autoconfig/contrib/admin/urls.py
+++ b/django_autoconfig/contrib/admin/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import include
+from django.conf.urls import include, url
 try:
     from django.conf.urls import patterns
 except ImportError:
@@ -8,5 +8,5 @@ def patterns(_, *args):
 
 admin.autodiscover()
 urlpatterns = patterns('',
-    ('', include(admin.site.urls)),
+    url('', include(admin.site.urls)),
 )
diff --git a/django_autoconfig/tests/app_contrib_admin/__init__.py b/django_autoconfig/tests/app_contrib_admin/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/django_autoconfig/tests/app_contrib_admin/autoconfig.py b/django_autoconfig/tests/app_contrib_admin/autoconfig.py
new file mode 100644
index 0000000..af81dee
--- /dev/null
+++ b/django_autoconfig/tests/app_contrib_admin/autoconfig.py
@@ -0,0 +1,5 @@
+SETTINGS = {
+    'INSTALLED_APPS': [
+        'django.contrib.admin',
+    ],
+}
diff --git a/django_autoconfig/tests/test_autoconfig.py b/django_autoconfig/tests/test_autoconfig.py
index 065b12a..006cd45 100644
--- a/django_autoconfig/tests/test_autoconfig.py
+++ b/django_autoconfig/tests/test_autoconfig.py
@@ -298,6 +298,23 @@ def test_url_prefixes(self):
         )
         resolve('/flibble/index/', urlconf=self)
 
+    def test_contrib_admin(self):
+        '''
+        Test that our django.contrib.admin dependencies work.
+        '''
+        settings_dict = {
+            'INSTALLED_APPS': [
+                'django_autoconfig.tests.app_contrib_admin',
+            ],
+        }
+
+        autoconfig.configure_settings(settings_dict)
+        with test.utils.override_settings(**settings_dict):
+            self.create_urlconf(
+                list(settings_dict['INSTALLED_APPS']) + list(settings_dict['AUTOCONFIG_EXTRA_URLS']),
+            )
+            resolve('/django-autoconfig.contrib.admin/', urlconf=self)
+
 
 @test.utils.override_settings(ROOT_URLCONF='django_autoconfig.tests.index_view_urlconf')
 class IndexViewTestCase(test.TestCase):