Loading django/conf/urls/__init__.py +6 −0 Original line number Diff line number Diff line Loading @@ -67,6 +67,12 @@ def url(regex, view, kwargs=None, name=None, prefix=''): return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace) else: if isinstance(view, six.string_types): warnings.warn( 'Support for string view arguments to url() is deprecated and ' 'will be removed in Django 2.0 (got %s). Pass the callable ' 'instead.' % view, RemovedInDjango20Warning, stacklevel=2 ) if not view: raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex) if prefix: Loading django/conf/urls/i18n.py +2 −1 Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ from django.conf.urls import patterns, url from django.core.urlresolvers import LocaleRegexURLResolver from django.utils import six from django.utils.deprecation import RemovedInDjango20Warning from django.views.i18n import set_language def i18n_patterns(prefix, *args): Loading @@ -30,5 +31,5 @@ def i18n_patterns(prefix, *args): urlpatterns = [ url(r'^setlang/$', 'django.views.i18n.set_language', name='set_language'), url(r'^setlang/$', set_language, name='set_language'), ] django/conf/urls/static.py +2 −1 Original line number Diff line number Diff line Loading @@ -3,9 +3,10 @@ import re from django.conf import settings from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.views.static import serve def static(prefix, view='django.views.static.serve', **kwargs): def static(prefix, view=serve, **kwargs): """ Helper function to return a URL pattern for serving files in debug mode. Loading django/contrib/auth/tests/urls.py +16 −16 Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ from django.contrib import admin from django.contrib.auth import context_processors from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.urls import urlpatterns from django.contrib.auth.views import password_reset, login from django.contrib.auth import views from django.contrib.auth.decorators import login_required from django.contrib.messages.api import info from django.http import HttpResponse, HttpRequest Loading Loading @@ -67,29 +67,29 @@ def userpage(request): def custom_request_auth_login(request): return login(request, authentication_form=CustomRequestAuthenticationForm) return views.login(request, authentication_form=CustomRequestAuthenticationForm) # special urls for auth test cases urlpatterns += [ url(r'^logout/custom_query/$', 'django.contrib.auth.views.logout', dict(redirect_field_name='follow')), url(r'^logout/next_page/$', 'django.contrib.auth.views.logout', dict(next_page='/somewhere/')), url(r'^logout/next_page/named/$', 'django.contrib.auth.views.logout', dict(next_page='password_reset')), url(r'^logout/custom_query/$', views.logout, dict(redirect_field_name='follow')), url(r'^logout/next_page/$', views.logout, dict(next_page='/somewhere/')), url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')), url(r'^remote_user/$', remote_user_auth_view), url(r'^password_reset_from_email/$', 'django.contrib.auth.views.password_reset', dict(from_email='staffmember@example.com')), url(r'^password_reset/custom_redirect/$', 'django.contrib.auth.views.password_reset', dict(post_reset_redirect='/custom/')), url(r'^password_reset/custom_redirect/named/$', 'django.contrib.auth.views.password_reset', dict(post_reset_redirect='password_reset')), url(r'^password_reset/html_email_template/$', 'django.contrib.auth.views.password_reset', dict(html_email_template_name='registration/html_password_reset_email.html')), url(r'^password_reset_from_email/$', views.password_reset, dict(from_email='staffmember@example.com')), url(r'^password_reset/custom_redirect/$', views.password_reset, dict(post_reset_redirect='/custom/')), url(r'^password_reset/custom_redirect/named/$', views.password_reset, dict(post_reset_redirect='password_reset')), url(r'^password_reset/html_email_template/$', views.password_reset, dict(html_email_template_name='registration/html_password_reset_email.html')), url(r'^reset/custom/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm', views.password_reset_confirm, dict(post_reset_redirect='/custom/')), url(r'^reset/custom/named/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm', views.password_reset_confirm, dict(post_reset_redirect='password_reset')), url(r'^password_change/custom/$', 'django.contrib.auth.views.password_change', dict(post_change_redirect='/custom/')), url(r'^password_change/custom/named/$', 'django.contrib.auth.views.password_change', dict(post_change_redirect='password_reset')), url(r'^admin_password_reset/$', 'django.contrib.auth.views.password_reset', dict(is_admin_site=True)), url(r'^login_required/$', login_required(password_reset)), url(r'^login_required_login_url/$', login_required(password_reset, login_url='/somewhere/')), url(r'^password_change/custom/$', views.password_change, dict(post_change_redirect='/custom/')), url(r'^password_change/custom/named/$', views.password_change, dict(post_change_redirect='password_reset')), url(r'^admin_password_reset/$', views.password_reset, dict(is_admin_site=True)), url(r'^login_required/$', login_required(views.password_reset)), url(r'^login_required_login_url/$', login_required(views.password_reset, login_url='/somewhere/')), url(r'^auth_processor_no_attr_access/$', auth_processor_no_attr_access), url(r'^auth_processor_attr_access/$', auth_processor_attr_access), Loading django/contrib/staticfiles/urls.py +2 −1 Original line number Diff line number Diff line from django.conf import settings from django.conf.urls.static import static from django.contrib.staticfiles.views import serve urlpatterns = [] Loading @@ -10,7 +11,7 @@ def staticfiles_urlpatterns(prefix=None): """ if prefix is None: prefix = settings.STATIC_URL return static(prefix, view='django.contrib.staticfiles.views.serve') return static(prefix, view=serve) # Only append if urlpatterns are empty if settings.DEBUG and not urlpatterns: Loading Loading
django/conf/urls/__init__.py +6 −0 Original line number Diff line number Diff line Loading @@ -67,6 +67,12 @@ def url(regex, view, kwargs=None, name=None, prefix=''): return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace) else: if isinstance(view, six.string_types): warnings.warn( 'Support for string view arguments to url() is deprecated and ' 'will be removed in Django 2.0 (got %s). Pass the callable ' 'instead.' % view, RemovedInDjango20Warning, stacklevel=2 ) if not view: raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex) if prefix: Loading
django/conf/urls/i18n.py +2 −1 Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ from django.conf.urls import patterns, url from django.core.urlresolvers import LocaleRegexURLResolver from django.utils import six from django.utils.deprecation import RemovedInDjango20Warning from django.views.i18n import set_language def i18n_patterns(prefix, *args): Loading @@ -30,5 +31,5 @@ def i18n_patterns(prefix, *args): urlpatterns = [ url(r'^setlang/$', 'django.views.i18n.set_language', name='set_language'), url(r'^setlang/$', set_language, name='set_language'), ]
django/conf/urls/static.py +2 −1 Original line number Diff line number Diff line Loading @@ -3,9 +3,10 @@ import re from django.conf import settings from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.views.static import serve def static(prefix, view='django.views.static.serve', **kwargs): def static(prefix, view=serve, **kwargs): """ Helper function to return a URL pattern for serving files in debug mode. Loading
django/contrib/auth/tests/urls.py +16 −16 Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ from django.contrib import admin from django.contrib.auth import context_processors from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.urls import urlpatterns from django.contrib.auth.views import password_reset, login from django.contrib.auth import views from django.contrib.auth.decorators import login_required from django.contrib.messages.api import info from django.http import HttpResponse, HttpRequest Loading Loading @@ -67,29 +67,29 @@ def userpage(request): def custom_request_auth_login(request): return login(request, authentication_form=CustomRequestAuthenticationForm) return views.login(request, authentication_form=CustomRequestAuthenticationForm) # special urls for auth test cases urlpatterns += [ url(r'^logout/custom_query/$', 'django.contrib.auth.views.logout', dict(redirect_field_name='follow')), url(r'^logout/next_page/$', 'django.contrib.auth.views.logout', dict(next_page='/somewhere/')), url(r'^logout/next_page/named/$', 'django.contrib.auth.views.logout', dict(next_page='password_reset')), url(r'^logout/custom_query/$', views.logout, dict(redirect_field_name='follow')), url(r'^logout/next_page/$', views.logout, dict(next_page='/somewhere/')), url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')), url(r'^remote_user/$', remote_user_auth_view), url(r'^password_reset_from_email/$', 'django.contrib.auth.views.password_reset', dict(from_email='staffmember@example.com')), url(r'^password_reset/custom_redirect/$', 'django.contrib.auth.views.password_reset', dict(post_reset_redirect='/custom/')), url(r'^password_reset/custom_redirect/named/$', 'django.contrib.auth.views.password_reset', dict(post_reset_redirect='password_reset')), url(r'^password_reset/html_email_template/$', 'django.contrib.auth.views.password_reset', dict(html_email_template_name='registration/html_password_reset_email.html')), url(r'^password_reset_from_email/$', views.password_reset, dict(from_email='staffmember@example.com')), url(r'^password_reset/custom_redirect/$', views.password_reset, dict(post_reset_redirect='/custom/')), url(r'^password_reset/custom_redirect/named/$', views.password_reset, dict(post_reset_redirect='password_reset')), url(r'^password_reset/html_email_template/$', views.password_reset, dict(html_email_template_name='registration/html_password_reset_email.html')), url(r'^reset/custom/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm', views.password_reset_confirm, dict(post_reset_redirect='/custom/')), url(r'^reset/custom/named/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm', views.password_reset_confirm, dict(post_reset_redirect='password_reset')), url(r'^password_change/custom/$', 'django.contrib.auth.views.password_change', dict(post_change_redirect='/custom/')), url(r'^password_change/custom/named/$', 'django.contrib.auth.views.password_change', dict(post_change_redirect='password_reset')), url(r'^admin_password_reset/$', 'django.contrib.auth.views.password_reset', dict(is_admin_site=True)), url(r'^login_required/$', login_required(password_reset)), url(r'^login_required_login_url/$', login_required(password_reset, login_url='/somewhere/')), url(r'^password_change/custom/$', views.password_change, dict(post_change_redirect='/custom/')), url(r'^password_change/custom/named/$', views.password_change, dict(post_change_redirect='password_reset')), url(r'^admin_password_reset/$', views.password_reset, dict(is_admin_site=True)), url(r'^login_required/$', login_required(views.password_reset)), url(r'^login_required_login_url/$', login_required(views.password_reset, login_url='/somewhere/')), url(r'^auth_processor_no_attr_access/$', auth_processor_no_attr_access), url(r'^auth_processor_attr_access/$', auth_processor_attr_access), Loading
django/contrib/staticfiles/urls.py +2 −1 Original line number Diff line number Diff line from django.conf import settings from django.conf.urls.static import static from django.contrib.staticfiles.views import serve urlpatterns = [] Loading @@ -10,7 +11,7 @@ def staticfiles_urlpatterns(prefix=None): """ if prefix is None: prefix = settings.STATIC_URL return static(prefix, view='django.contrib.staticfiles.views.serve') return static(prefix, view=serve) # Only append if urlpatterns are empty if settings.DEBUG and not urlpatterns: Loading