openstack
/
horizon
Code Issues Proposed changes

Merge "Remove leftovers of django.conf.urls.defaults"

This commit is contained in:
Jenkins 2014-01-12 08:38:48 +00:00 committed by Gerrit Code Review
parent 86bdac1f22 e0672fd879
commit 12890d890f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/topics/tutorial.rst
View File

@ -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('',

2
horizon/base.py
View File

@ -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