diff --git a/django/contrib/gis/gdal/prototypes/srs.py b/django/contrib/gis/gdal/prototypes/srs.py index 9b1da3ee06..45d5234346 100644 --- a/django/contrib/gis/gdal/prototypes/srs.py +++ b/django/contrib/gis/gdal/prototypes/srs.py @@ -65,7 +65,7 @@ to_pretty_wkt = string_output( # Memory leak fixed in GDAL 1.5; still exists in 1.4. to_xml = string_output(lgdal.OSRExportToXML, [c_void_p, POINTER(c_char_p), c_char_p], offset=-2, decoding='utf-8') -# String attribute retrival routines. +# String attribute retrieval routines. get_attr_value = const_string_output(std_call('OSRGetAttrValue'), [c_void_p, c_char_p, c_int], decoding='utf-8') get_auth_name = const_string_output(lgdal.OSRGetAuthorityName, [c_void_p, c_char_p], decoding='ascii') get_auth_code = const_string_output(lgdal.OSRGetAuthorityCode, [c_void_p, c_char_p], decoding='ascii') diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py index ddfb7e0116..613983581c 100644 --- a/django/core/files/uploadhandler.py +++ b/django/core/files/uploadhandler.py @@ -52,7 +52,7 @@ class SkipFile(UploadFileException): class StopFutureHandlers(UploadFileException): """ - Upload handers that have handled a file and do not want future handlers to + Upload handlers that have handled a file and do not want future handlers to run should raise this exception instead of returning None. """ pass diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 234c9416c6..e2bd712f56 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -86,7 +86,7 @@ def sanitize_address(addr, encoding): if rest: # The entire email address must be parsed. raise ValueError( - 'Invalid adddress; only %s could be parsed from "%s"' + 'Invalid address; only %s could be parsed from "%s"' % (token, addr) ) nm = token.display_name or '' diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py index 274dc29d6d..f46da0e957 100644 --- a/tests/aggregation_regress/tests.py +++ b/tests/aggregation_regress/tests.py @@ -377,7 +377,7 @@ class AggregationTests(TestCase): {'c__max': 3} ) - def test_conditional_aggreate(self): + def test_conditional_aggregate(self): # Conditional aggregation of a grouped queryset. self.assertEqual( Book.objects.annotate(c=Count('authors')).values('pk').aggregate(test=Sum( diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py index 434869554c..892d4129a5 100644 --- a/tests/file_storage/tests.py +++ b/tests/file_storage/tests.py @@ -520,8 +520,8 @@ class FileStorageTests(SimpleTestCase): ) defaults_storage = self.storage_class() settings = { - 'MEDIA_ROOT': 'overriden_media_root', - 'MEDIA_URL': 'overriden_media_url/', + 'MEDIA_ROOT': 'overridden_media_root', + 'MEDIA_URL': 'overridden_media_url/', 'FILE_UPLOAD_PERMISSIONS': 0o333, 'FILE_UPLOAD_DIRECTORY_PERMISSIONS': 0o333, } diff --git a/tests/forms_tests/widget_tests/test_select.py b/tests/forms_tests/widget_tests/test_select.py index 42de5b6e92..fd4c1fb34c 100644 --- a/tests/forms_tests/widget_tests/test_select.py +++ b/tests/forms_tests/widget_tests/test_select.py @@ -122,7 +122,7 @@ class SelectTest(WidgetTest): ), ) - def test_choices_constuctor(self): + def test_choices_constructor(self): widget = Select(choices=[(1, 1), (2, 2), (3, 3)]) self.check_html(widget, 'num', 2, html=( """