Commit 37ea3cb0 authored by Tim Graham's avatar Tim Graham
Browse files

Fixed "URLconf" spelling in code comments.

parent c08f85fd

django/core/handlers/base.py

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ class BaseHandler(object): 


            if response is None:

                if hasattr(request, 'urlconf'):

                    # Reset url resolver with a custom urlconf.

                    # Reset url resolver with a custom URLconf.

                    urlconf = request.urlconf

                    urlresolvers.set_urlconf(urlconf)

                    resolver = urlresolvers.get_resolver(urlconf)

django/core/urlresolvers.py

+3 −3
Original line number Diff line number Diff line
@@ -135,9 +135,9 @@ def get_resolver(urlconf=None): 


@lru_cache.lru_cache(maxsize=None)

def get_ns_resolver(ns_pattern, resolver):

    # Build a namespaced resolver for the given parent urlconf pattern.

    # Build a namespaced resolver for the given parent URLconf pattern.

    # This makes it possible to have captured parameters in the parent

    # urlconf pattern.

    # URLconf pattern.

    ns_resolver = RegexURLResolver(ns_pattern, resolver.url_patterns)

    return RegexURLResolver(r'^/', [ns_resolver])
@@ -381,7 +381,7 @@ class RegexURLResolver(LocaleRegexProvider): 
            iter(patterns)

        except TypeError:

            msg = (

                "The included urlconf '{name}' does not appear to have any "

                "The included URLconf '{name}' does not appear to have any "

                "patterns in it. If you see valid patterns in the file then "

                "the issue is probably caused by a circular import."

            )

django/views/generic/base.py

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ class TemplateResponseMixin(object): 
class TemplateView(TemplateResponseMixin, ContextMixin, View):

    """

    A view that renders a template.  This view will also pass into the context

    any keyword arguments passed by the url conf.

    any keyword arguments passed by the URLconf.

    """

    def get(self, request, *args, **kwargs):

        context = self.get_context_data(**kwargs)

tests/i18n/patterns/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class URLDisabledTests(URLTestCaseBase): 
@override_settings(ROOT_URLCONF='i18n.patterns.urls.path_unused')

class PathUnusedTests(URLTestCaseBase):

    """

    Check that if no i18n_patterns is used in root urlconfs, then no

    Check that if no i18n_patterns is used in root URLconfs, then no

    language activation happens based on url prefix.

    """

tests/middleware/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ class CommonMiddlewareTest(SimpleTestCase): 
        self.assertEqual(r.url,

            'http://www.testserver/slash/')



    # The following tests examine expected behavior given a custom urlconf that

    # The following tests examine expected behavior given a custom URLconf that

    # overrides the default one through the request object.



    @override_settings(APPEND_SLASH=True)