diff options
author | Min ho Kim <minho42@gmail.com> | 2019-08-06 01:47:50 +1000 |
---|---|---|
committer | Carlton Gibson <carlton@noumenal.es> | 2019-08-07 11:23:14 +0200 |
commit | 65e86948b80262574058a94ccaae3a9b59c3faea (patch) | |
tree | e3b74cea769a64bd2adb882b0dfb975fa200867c | |
parent | 052388aba47ba7166886fc741cac5ce3b22fea58 (diff) | |
download | django-65e86948b80262574058a94ccaae3a9b59c3faea.tar.gz |
Corrected several typos in string literals and test names.
-rw-r--r-- | django/contrib/gis/gdal/prototypes/srs.py | 2 | ||||
-rw-r--r-- | django/core/files/uploadhandler.py | 2 | ||||
-rw-r--r-- | django/core/mail/message.py | 2 | ||||
-rw-r--r-- | tests/aggregation_regress/tests.py | 2 | ||||
-rw-r--r-- | tests/file_storage/tests.py | 4 | ||||
-rw-r--r-- | tests/forms_tests/widget_tests/test_select.py | 2 | ||||
-rw-r--r-- | tests/m2m_intermediary/tests.py | 2 | ||||
-rw-r--r-- | tests/migrations/test_commands.py | 2 | ||||
-rw-r--r-- | tests/serializers/tests.py | 2 | ||||
-rw-r--r-- | tests/test_runner/tests.py | 2 |
10 files changed, 11 insertions, 11 deletions
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=( """<select name="num"> diff --git a/tests/m2m_intermediary/tests.py b/tests/m2m_intermediary/tests.py index 215f6f86c6..84dd250801 100644 --- a/tests/m2m_intermediary/tests.py +++ b/tests/m2m_intermediary/tests.py @@ -6,7 +6,7 @@ from .models import Article, Reporter, Writer class M2MIntermediaryTests(TestCase): - def test_intermeiary(self): + def test_intermediary(self): r1 = Reporter.objects.create(first_name="John", last_name="Smith") r2 = Reporter.objects.create(first_name="Jane", last_name="Doe") diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 4132b96be0..64b5c9bfd0 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -80,7 +80,7 @@ class MigrateTests(MigrationTestBase): call_command('migrate', app_label='unmigrated_app_syncdb') @override_settings(MIGRATION_MODULES={'migrations': 'migrations.test_migrations_clashing_prefix'}) - def test_ambigious_prefix(self): + def test_ambiguous_prefix(self): msg = ( "More than one migration matches 'a' in app 'migrations'. Please " "be more specific." diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py index d0e4723fc7..4bee157ace 100644 --- a/tests/serializers/tests.py +++ b/tests/serializers/tests.py @@ -55,7 +55,7 @@ class SerializerRegistrationTests(SimpleTestCase): serializers.unregister_serializer("nonsense") def test_builtin_serializers(self): - "Requesting a list of serializer formats popuates the registry" + "Requesting a list of serializer formats populates the registry" all_formats = set(serializers.get_serializer_formats()) public_formats = set(serializers.get_public_serializer_formats()) diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index 3f4e257261..85e4e75720 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -292,7 +292,7 @@ class DummyBackendTest(unittest.TestCase): class AliasedDefaultTestSetupTest(unittest.TestCase): def test_setup_aliased_default_database(self): """ - setup_datebases() doesn't fail when 'default' is aliased + setup_databases() doesn't fail when 'default' is aliased """ tested_connections = db.ConnectionHandler({ 'default': { |