diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/__init__.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/sites.py | 2 | ||||
| -rw-r--r-- | django/contrib/auth/tests/views.py | 4 | ||||
| -rw-r--r-- | django/contrib/formtools/test_urls.py | 6 | ||||
| -rw-r--r-- | django/core/urlresolvers.py | 4 |
5 files changed, 8 insertions, 10 deletions
diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py index bb856a1241..0becfeb96e 100644 --- a/django/contrib/admin/__init__.py +++ b/django/contrib/admin/__init__.py @@ -13,7 +13,7 @@ def autodiscover(): may want. """ # Bail out if autodiscover didn't finish loading from a previous call so - # that we avoid running autodiscover again when the URLConf is loaded by + # that we avoid running autodiscover again when the URLconf is loaded by # the exception handler to resolve the handler500 view. This prevents an # admin.py module with errors from re-registering models and raising a # spurious AlreadyRegistered exception (see #8245). diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index cbf1666804..59b24c198e 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -25,7 +25,7 @@ class NotRegistered(Exception): class AdminSite(object): """ An AdminSite object encapsulates an instance of the Django admin application, ready - to be hooked in to your URLConf. Models are registered with the AdminSite using the + to be hooked in to your URLconf. Models are registered with the AdminSite using the register() method, and the root() method can then be used as a Django view function that presents a full admin interface for the collection of registered models. """ diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py index ec98cf07f7..3e5cbabf05 100644 --- a/django/contrib/auth/tests/views.py +++ b/django/contrib/auth/tests/views.py @@ -47,8 +47,8 @@ class PasswordResetTest(TestCase): def test_confirm_invalid(self): url, path = self._test_confirm_start() - # Lets munge the token in the path, but keep the same length, - # in case the URL conf will reject a different length + # Let's munge the token in the path, but keep the same length, + # in case the URLconf will reject a different length. path = path[:-5] + ("0"*4) + path[-1] response = self.client.get(path) diff --git a/django/contrib/formtools/test_urls.py b/django/contrib/formtools/test_urls.py index 19dbbd1ae4..44a58d2a7f 100644 --- a/django/contrib/formtools/test_urls.py +++ b/django/contrib/formtools/test_urls.py @@ -1,9 +1,7 @@ """ - -This is a urlconf to be loaded by tests.py. Add any urls needed -for tests only. - +This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only. """ + from django.conf.urls.defaults import * from django.contrib.formtools.tests import * diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index c61cdde65a..c8642e738f 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -23,7 +23,7 @@ except NameError: from django.utils.itercompat import reversed # Python 2.3 fallback from sets import Set as set -_resolver_cache = {} # Maps urlconf modules to RegexURLResolver instances. +_resolver_cache = {} # Maps URLconf modules to RegexURLResolver instances. _callable_cache = {} # Maps view and url pattern names to their view functions. # SCRIPT_NAME prefixes for each thread are stored here. If there's no entry for @@ -140,7 +140,7 @@ class RegexURLPattern(object): class RegexURLResolver(object): def __init__(self, regex, urlconf_name, default_kwargs=None): # regex is a string representing a regular expression. - # urlconf_name is a string representing the module containing urlconfs. + # urlconf_name is a string representing the module containing URLconfs. self.regex = re.compile(regex, re.UNICODE) self.urlconf_name = urlconf_name self.callback = None |