From 7d200949968002d2c2b4390953e8bda7153a49c9 Mon Sep 17 00:00:00 2001
From: james mike dupont <jamesmikedupont@gmail.com>
Date: Thu, 19 Jan 2017 05:00:41 -0500
Subject: [PATCH] Fixed spelling mistakes in code and comments.
---
django/db/backends/mysql/base.py | 4 ++--
django/db/backends/utils.py | 6 +++---
tests/inspectdb/models.py | 2 +-
tests/inspectdb/tests.py | 4 ++--
tests/model_fields/test_foreignkey.py | 6 +++---
tests/model_fields/test_manytomanyfield.py | 8 ++++----
tests/urlpatterns_reverse/tests.py | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index 3239ba104f..9f91134325 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -116,8 +116,8 @@ class CursorWrapper:
return self
def __exit__(self, type, value, traceback):
- # Ticket #17671 - Close instead of passing thru to avoid backend
- # specific behavior.
+ # Close instead of passing through to avoid backend-specific behavior
+ # (#17671).
self.close()
diff --git a/django/db/backends/utils.py b/django/db/backends/utils.py
index f6cb59a086..3baff0d3d5 100644
--- a/django/db/backends/utils.py
+++ b/django/db/backends/utils.py
@@ -34,9 +34,9 @@ class CursorWrapper:
return self
def __exit__(self, type, value, traceback):
- # Ticket #17671 - Close instead of passing thru to avoid backend
- # specific behavior. Catch errors liberally because errors in cleanup
- # code aren't useful.
+ # Close instead of passing through to avoid backend-specific behavior
+ # (#17671). Catch errors liberally because errors in cleanup code
+ # aren't useful.
try:
self.close()
except self.db.Database.Error:
diff --git a/tests/inspectdb/models.py b/tests/inspectdb/models.py
index 668fc51aed..1a001b653e 100644
--- a/tests/inspectdb/models.py
+++ b/tests/inspectdb/models.py
@@ -55,7 +55,7 @@ class ColumnTypes(models.Model):
file_path_field = models.FilePathField()
float_field = models.FloatField()
int_field = models.IntegerField()
- gen_ip_adress_field = models.GenericIPAddressField(protocol="ipv4")
+ gen_ip_address_field = models.GenericIPAddressField(protocol="ipv4")
pos_int_field = models.PositiveIntegerField()
pos_small_int_field = models.PositiveSmallIntegerField()
slug_field = models.SlugField()
diff --git a/tests/inspectdb/tests.py b/tests/inspectdb/tests.py
index ef26233342..726a65cd8f 100644
--- a/tests/inspectdb/tests.py
+++ b/tests/inspectdb/tests.py
@@ -66,9 +66,9 @@ class InspectDBTestCase(TestCase):
assertFieldType('date_field', "models.DateField()")
assertFieldType('date_time_field', "models.DateTimeField()")
if connection.features.can_introspect_ip_address_field:
- assertFieldType('gen_ip_adress_field', "models.GenericIPAddressField()")
+ assertFieldType('gen_ip_address_field', "models.GenericIPAddressField()")
elif not connection.features.interprets_empty_strings_as_nulls:
- assertFieldType('gen_ip_adress_field', "models.CharField(max_length=39)")
+ assertFieldType('gen_ip_address_field', "models.CharField(max_length=39)")
if connection.features.can_introspect_time_field:
assertFieldType('time_field', "models.TimeField()")
if connection.features.has_native_uuid_field:
diff --git a/tests/model_fields/test_foreignkey.py b/tests/model_fields/test_foreignkey.py
index 2580e3b650..1617f7f310 100644
--- a/tests/model_fields/test_foreignkey.py
+++ b/tests/model_fields/test_foreignkey.py
@@ -74,14 +74,14 @@ class ForeignKeyTests(TestCase):
@isolate_apps('model_fields', 'model_fields.tests')
def test_abstract_model_app_relative_foreign_key(self):
class AbstractReferent(models.Model):
- reference = models.ForeignKey('Refered', on_delete=models.CASCADE)
+ reference = models.ForeignKey('Referred', on_delete=models.CASCADE)
class Meta:
app_label = 'model_fields'
abstract = True
def assert_app_model_resolved(label):
- class Refered(models.Model):
+ class Referred(models.Model):
class Meta:
app_label = label
@@ -89,7 +89,7 @@ class ForeignKeyTests(TestCase):
class Meta:
app_label = label
- self.assertEqual(ConcreteReferent._meta.get_field('reference').related_model, Refered)
+ self.assertEqual(ConcreteReferent._meta.get_field('reference').related_model, Referred)
assert_app_model_resolved('model_fields')
assert_app_model_resolved('tests')
diff --git a/tests/model_fields/test_manytomanyfield.py b/tests/model_fields/test_manytomanyfield.py
index e4f1c0469d..b270048bd8 100644
--- a/tests/model_fields/test_manytomanyfield.py
+++ b/tests/model_fields/test_manytomanyfield.py
@@ -39,19 +39,19 @@ class ManyToManyFieldTests(SimpleTestCase):
@isolate_apps('model_fields', 'model_fields.tests')
def test_abstract_model_app_relative_foreign_key(self):
class AbstractReferent(models.Model):
- reference = models.ManyToManyField('Refered', through='Through')
+ reference = models.ManyToManyField('Referred', through='Through')
class Meta:
app_label = 'model_fields'
abstract = True
def assert_app_model_resolved(label):
- class Refered(models.Model):
+ class Referred(models.Model):
class Meta:
app_label = label
class Through(models.Model):
- refered = models.ForeignKey('Refered', on_delete=models.CASCADE)
+ referred = models.ForeignKey('Referred', on_delete=models.CASCADE)
referent = models.ForeignKey('ConcreteReferent', on_delete=models.CASCADE)
class Meta:
@@ -61,7 +61,7 @@ class ManyToManyFieldTests(SimpleTestCase):
class Meta:
app_label = label
- self.assertEqual(ConcreteReferent._meta.get_field('reference').related_model, Refered)
+ self.assertEqual(ConcreteReferent._meta.get_field('reference').related_model, Referred)
self.assertEqual(ConcreteReferent.reference.through, Through)
assert_app_model_resolved('model_fields')
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index efb30dc2ff..a7f7c2fcc8 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -391,7 +391,7 @@ class ResolverTests(SimpleTestCase):
A Resolver404 is raised if resolving doesn't meet the basic
requirements of a path to match - i.e., at the very least, it matches
the root pattern '^/'. Never return None from resolve() to prevent a
- TypeError from occuring later (#10834).
+ TypeError from occurring later (#10834).
"""
with self.assertRaises(Resolver404):
resolve('')