summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/core/management/base.py4
-rw-r--r--django/core/management/utils.py2
-rw-r--r--tests/urlpatterns/tests.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/django/core/management/base.py b/django/core/management/base.py
index c725e5b75e..0376d67662 100644
--- a/django/core/management/base.py
+++ b/django/core/management/base.py
@@ -465,10 +465,10 @@ class BaseCommand:
apps_waiting_migration = sorted({migration.app_label for migration, backwards in plan})
self.stdout.write(
self.style.NOTICE(
- "\nYou have %(unpplied_migration_count)s unapplied migration(s). "
+ "\nYou have %(unapplied_migration_count)s unapplied migration(s). "
"Your project may not work properly until you apply the "
"migrations for app(s): %(apps_waiting_migration)s." % {
- "unpplied_migration_count": len(plan),
+ "unapplied_migration_count": len(plan),
"apps_waiting_migration": ", ".join(apps_waiting_migration),
}
)
diff --git a/django/core/management/utils.py b/django/core/management/utils.py
index c7580c1931..c201684c9c 100644
--- a/django/core/management/utils.py
+++ b/django/core/management/utils.py
@@ -113,7 +113,7 @@ def parse_apps_and_model_labels(labels):
def get_command_line_option(argv, option):
"""
Return the value of a command line option (which should include leading
- dashes, e.g. '--testrunnner') from an argument list. Return None if the
+ dashes, e.g. '--testrunner') from an argument list. Return None if the
option wasn't passed or if the argument list couldn't be parsed.
"""
parser = CommandParser(add_help=False, allow_abbrev=False)
diff --git a/tests/urlpatterns/tests.py b/tests/urlpatterns/tests.py
index 214739f678..3c41104506 100644
--- a/tests/urlpatterns/tests.py
+++ b/tests/urlpatterns/tests.py
@@ -35,7 +35,7 @@ class SimplifiedURLTests(SimpleTestCase):
self.assertEqual(match.kwargs, {'year': 2015})
self.assertEqual(match.route, 'articles/<int:year>/')
- def test_path_lookup_with_multiple_paramaters(self):
+ def test_path_lookup_with_multiple_parameters(self):
match = resolve('/articles/2015/04/12/')
self.assertEqual(match.url_name, 'articles-year-month-day')
self.assertEqual(match.args, ())