diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/csrf/tests.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/db/backend/spatialite/creation.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/geos/libgeos.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/measure.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/templates/gis/admin/openlayers.html | 2 | ||||
| -rwxr-xr-x | django/core/files/uploadhandler.py | 2 | ||||
| -rw-r--r-- | django/template/defaulttags.py | 2 | ||||
| -rw-r--r-- | django/test/_doctest.py | 2 | ||||
| -rw-r--r-- | django/utils/feedgenerator.py | 2 | ||||
| -rw-r--r-- | django/views/generic/create_update.py | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/django/contrib/csrf/tests.py b/django/contrib/csrf/tests.py index f00929fb28..3c533a01e6 100644 --- a/django/contrib/csrf/tests.py +++ b/django/contrib/csrf/tests.py @@ -59,7 +59,7 @@ class CsrfMiddlewareTest(TestCase): # Check the post processing def test_process_response_no_session(self): """ - Check the the post-processor does nothing if no session active + Check the post-processor does nothing if no session active """ req = self._get_GET_no_session_request() resp = self._get_post_form_response() diff --git a/django/contrib/gis/db/backend/spatialite/creation.py b/django/contrib/gis/db/backend/spatialite/creation.py index cc668eca6a..9836773226 100644 --- a/django/contrib/gis/db/backend/spatialite/creation.py +++ b/django/contrib/gis/db/backend/spatialite/creation.py @@ -15,7 +15,7 @@ def create_test_spatial_db(verbosity=1, autoclobber=False, interactive=False): if settings.DATABASE_ENGINE != 'sqlite3': raise Exception('SpatiaLite database creation only supported on sqlite3 platform.') - # Getting the test database name using the the SQLite backend's + # Getting the test database name using the SQLite backend's # `_create_test_db`. Unless `TEST_DATABASE_NAME` is defined, # it returns ":memory:". db_name = connection.creation._create_test_db(verbosity, autoclobber) diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py index 0839a620c7..f1aecb0de5 100644 --- a/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py @@ -30,7 +30,7 @@ elif os.name == 'posix': else: raise ImportError('Unsupported OS "%s"' % os.name) -# Using the ctypes `find_library` utility to find the the path to the GEOS +# Using the ctypes `find_library` utility to find the path to the GEOS # shared library. This is better than manually specifiying each library name # and extension (e.g., libgeos_c.[so|so.1|dylib].). if lib_names: diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py index 7f345329bc..37922040df 100644 --- a/django/contrib/gis/measure.py +++ b/django/contrib/gis/measure.py @@ -41,7 +41,7 @@ from decimal import Decimal class MeasureBase(object): def default_units(self, kwargs): """ - Return the unit value and the the default units specified + Return the unit value and the default units specified from the given keyword arguments dictionary. """ val = 0.0 diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index 0870c65562..4292eb6474 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -15,7 +15,7 @@ </style> <!--[if IE]> <style type="text/css"> - /* This fixes the the mouse offset issues in IE. */ + /* This fixes the mouse offset issues in IE. */ #{{ id }}_admin_map { position: static; vertical-align: top; } /* `font-size: 0` fixes the 1px border between tiles, but borks LayerSwitcher. Thus, this is disabled until a better fix is found. diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py index f6945853fe..6c769780e5 100755 --- a/django/core/files/uploadhandler.py +++ b/django/core/files/uploadhandler.py @@ -152,7 +152,7 @@ class MemoryFileUploadHandler(FileUploadHandler): Use the content_length to signal whether or not this handler should be in use. """ # Check the content-length header to see if we should - # If the the post is too large, we cannot use the Memory handler. + # If the post is too large, we cannot use the Memory handler. if content_length > settings.FILE_UPLOAD_MAX_MEMORY_SIZE: self.activated = False else: diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 1d8e039a9a..a61dd8b36c 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -1136,7 +1136,7 @@ def widthratio(parser, token): <img src='bar.gif' height='10' width='{% widthratio this_value max_value 100 %}' /> - Above, if ``this_value`` is 175 and ``max_value`` is 200, the the image in + Above, if ``this_value`` is 175 and ``max_value`` is 200, the image in the above example will be 88 pixels wide (because 175/200 = .875; .875 * 100 = 87.5 which is rounded up to 88). """ diff --git a/django/test/_doctest.py b/django/test/_doctest.py index a56483c3ab..17fc88a1bc 100644 --- a/django/test/_doctest.py +++ b/django/test/_doctest.py @@ -1,5 +1,5 @@ # This is a slightly modified version of the doctest.py that shipped with Python 2.4 -# It incorporates changes that have been submitted the the Python ticket tracker +# It incorporates changes that have been submitted to the Python ticket tracker # as ticket #1521051. These changes allow for a DoctestRunner and Doctest base # class to be specified when constructing a DoctestSuite. diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index de924a3077..c9445f932f 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -121,7 +121,7 @@ class SyndicationFeed(object): def add_root_elements(self, handler): """ - Add elements in the the root (i.e. feed/channel) element. Called + Add elements in the root (i.e. feed/channel) element. Called from write(). """ pass diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py index 634fb1bdcd..f1f718e79d 100644 --- a/django/views/generic/create_update.py +++ b/django/views/generic/create_update.py @@ -71,7 +71,7 @@ def redirect(post_save_redirect, obj): def lookup_object(model, object_id, slug, slug_field): """ Return the ``model`` object with the passed ``object_id``. If - ``object_id`` is None, then return the the object whose ``slug_field`` + ``object_id`` is None, then return the object whose ``slug_field`` equals the passed ``slug``. If ``slug`` and ``slug_field`` are not passed, then raise Http404 exception. """ |