diff options
| author | Tim Graham <timograham@gmail.com> | 2015-08-17 11:07:03 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:09 -0400 |
| commit | d79122f40ba2016b1a943e2e1ba46984b2ef99ad (patch) | |
| tree | d41d0dff61486d0b033fce110823da569cc5c1fc /django/conf/urls | |
| parent | a25d3ce007b90a0516aed54fc1c5a16510a290e4 (diff) | |
Refs #23276 -- Removed passing views as strings to url() per deprecation timeline.
Diffstat (limited to 'django/conf/urls')
| -rw-r--r-- | django/conf/urls/__init__.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/django/conf/urls/__init__.py b/django/conf/urls/__init__.py index d63dbe9213..f9cd305ece 100644 --- a/django/conf/urls/__init__.py +++ b/django/conf/urls/__init__.py @@ -6,9 +6,7 @@ from django.core.urlresolvers import ( LocaleRegexURLResolver, RegexURLPattern, RegexURLResolver, ) from django.utils import six -from django.utils.deprecation import ( - RemovedInDjango20Warning, RemovedInDjango110Warning, -) +from django.utils.deprecation import RemovedInDjango20Warning __all__ = ['handler400', 'handler403', 'handler404', 'handler500', 'include', 'url'] @@ -76,21 +74,10 @@ def include(arg, namespace=None, app_name=None): return (urlconf_module, app_name, namespace) -def url(regex, view, kwargs=None, name=None, prefix=''): +def url(regex, view, kwargs=None, name=None): if isinstance(view, (list, tuple)): # For include(...) processing. urlconf_module, app_name, namespace = view 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 1.10 (got %s). Pass the callable ' - 'instead.' % view, - RemovedInDjango110Warning, stacklevel=2 - ) - if not view: - raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex) - if prefix: - view = prefix + '.' + view return RegexURLPattern(regex, view, kwargs, name) |
