summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2014-03-02 15:25:53 +0100
committerTim Graham <timograham@gmail.com>2014-03-03 07:38:09 -0500
commit0d912258921a442c48d5787228db2db5af7e8fa5 (patch)
treef6826425de5bca2498c46e5242b870282a34eda2 /django/db/models/sql
parent6acaa5238668593d6d854b28dbfa65e95796585c (diff)
Fixed many typos in comments and docstrings.
Thanks Piotr Kasprzyk for help with the patch.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/compiler.py2
-rw-r--r--django/db/models/sql/query.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index d4bd61d462..11c503cd5d 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -890,7 +890,7 @@ class SQLInsertCompiler(SQLCompiler):
col = "%s.%s" % (qn(opts.db_table), qn(opts.pk.column))
result.append("VALUES (%s)" % ", ".join(placeholders[0]))
r_fmt, r_params = self.connection.ops.return_insert_id()
- # Skip empty r_fmt to allow subclasses to customize behaviour for
+ # Skip empty r_fmt to allow subclasses to customize behavior for
# 3rd party backends. Refs #19096.
if r_fmt:
result.append(r_fmt % col)
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 703ed12eda..7bfdceb183 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -568,7 +568,7 @@ class Query(object):
Converts the self.deferred_loading data structure to an alternate data
structure, describing the field that *will* be loaded. This is used to
compute the columns to select from the database and also by the
- QuerySet class to work out which fields are being initialised on each
+ QuerySet class to work out which fields are being initialized on each
model. Models that have all their fields included aren't mentioned in
the result, only those that have field restrictions in place.
@@ -1767,7 +1767,7 @@ class Query(object):
"""
# Fields on related models are stored in the literal double-underscore
# format, so that we can use a set datastructure. We do the foo__bar
- # splitting and handling when computing the SQL colum names (as part of
+ # splitting and handling when computing the SQL column names (as part of
# get_columns()).
existing, defer = self.deferred_loading
if defer: