Merge pull request #38 from mikebryant/wip-37

Fix django.contrib.admin urls on Django 1.10. Fixes #37

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)),
 )

django_autoconfig/tests/app_contrib_admin/autoconfig.py

@@ -0,0 +1,5 @@
+SETTINGS = {
+    'INSTALLED_APPS': [
+        'django.contrib.admin',
+    ],
+}

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):