summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorpp <pp@users.noreply.github.com>2016-01-10 17:48:16 +0100
committerTim Graham <timograham@gmail.com>2016-01-11 18:05:56 -0500
commit1cbc556bcee57c1d2cbbbe3e6ce3b8d9949f186f (patch)
treeb494f9bc739fef040e013e1cde9bc9e48b1c880d /django
parent27ef6403c8b9f332feb1f9fe52053ded0b91da85 (diff)
[1.9.x] Added missing period to "etc.".
Backport of b34ff66e5bae3760273255fa5b2525eb21a5eb63 from master
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/base/operations.py2
-rw-r--r--django/template/defaultfilters.py2
-rw-r--r--django/template/smartif.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py
index 79572651c4..6e5aff19cd 100644
--- a/django/db/backends/base/operations.py
+++ b/django/db/backends/base/operations.py
@@ -227,7 +227,7 @@ class BaseDatabaseOperations(object):
def lookup_cast(self, lookup_type, internal_type=None):
"""
Returns the string to use in a query when performing lookups
- ("contains", "like", etc). The resulting string should contain a '%s'
+ ("contains", "like", etc.). The resulting string should contain a '%s'
placeholder for the column being searched against.
"""
return "%s"
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index 35dc9f0b67..eba65e5ed9 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -888,7 +888,7 @@ def yesno(value, arg=None):
def filesizeformat(bytes):
"""
Formats the value like a 'human-readable' file size (i.e. 13 KB, 4.1 MB,
- 102 bytes, etc).
+ 102 bytes, etc.).
"""
try:
bytes = float(bytes)
diff --git a/django/template/smartif.py b/django/template/smartif.py
index 36c76cb5e6..0d9e456749 100644
--- a/django/template/smartif.py
+++ b/django/template/smartif.py
@@ -123,7 +123,7 @@ class Literal(TokenBase):
"""
# IfParser uses Literal in create_var, but TemplateIfParser overrides
# create_var so that a proper implementation that actually resolves
- # variables, filters etc is used.
+ # variables, filters etc. is used.
id = "literal"
lbp = 0