From e0672fd879d81878e94184776c47d75dd050b7a5 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Tue, 7 Jan 2014 12:32:20 +0100 Subject: [PATCH] Remove leftovers of django.conf.urls.defaults Partially-implements blueprint django-1point6 Change-Id: I76604f7dac3bf00f5f6e4ddbf76c8ea9f21c6954 --- doc/source/topics/tutorial.rst | 2 +- horizon/base.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/topics/tutorial.rst b/doc/source/topics/tutorial.rst index 6e3110b412..61105fadd6 100644 --- a/doc/source/topics/tutorial.rst +++ b/doc/source/topics/tutorial.rst @@ -221,7 +221,7 @@ find a ``urls.py`` file in your panel directory which will define a view named ``index`` that handles the default view for that panel. This is what your ``urls.py`` file might look like:: - from django.conf.urls.defaults import patterns, url + from django.conf.urls import patterns, url from .views import IndexView urlpatterns = patterns('', diff --git a/horizon/base.py b/horizon/base.py index 803c1651a9..adc9f10f3f 100644 --- a/horizon/base.py +++ b/horizon/base.py @@ -238,7 +238,7 @@ class Panel(HorizonComponent): _decorate_urlconf(urlpatterns, require_perms, permissions) _decorate_urlconf(urlpatterns, _current_component, panel=self) - # Return the three arguments to django.conf.urls.defaults.include + # Return the three arguments to django.conf.urls.include return urlpatterns, self.slug, self.slug