Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #1626 -- Fixed a bunch of typos in comments and docs. Thanks, D…

…exter

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 00b3891524643d0febd2f54a01021c46c103a520 1 parent 853ee34
@adrianholovaty adrianholovaty authored
View
2  django/contrib/admin/templatetags/admin_list.py
@@ -79,7 +79,7 @@ def result_headers(cl):
if field_name == '__repr__':
header = lookup_opts.verbose_name
else:
- func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propogate.
+ func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propagate.
try:
header = func.short_description
except AttributeError:
View
2  django/core/meta/__init__.py
@@ -1733,7 +1733,7 @@ def manipulator_init(opts, add, change, self, obj_key=None, follow=None):
if opts.one_to_one_field:
# Sanity check -- Make sure the "parent" object exists.
# For example, make sure the Place exists for the Restaurant.
- # Let the ObjectDoesNotExist exception propogate up.
+ # Let the ObjectDoesNotExist exception propagate up.
lookup_kwargs = opts.one_to_one_field.rel.limit_choices_to
lookup_kwargs['%s__exact' % opts.one_to_one_field.rel.field_name] = obj_key
_ = opts.one_to_one_field.rel.to.get_model_module().get_object(**lookup_kwargs)
View
2  django/core/meta/fields.py
@@ -80,7 +80,7 @@ def __repr__(self):
# A guide to Field parameters:
#
-# * name: The name of the field specifed in the model.
+# * name: The name of the field specified in the model.
# * attname: The attribute to use on the model object. This is the same as
# "name", except in the case of ForeignKeys, where "_id" is
# appended.
View
2  django/core/servers/basehttp.py
@@ -46,7 +46,7 @@ def next(self):
raise StopIteration
# Regular expression that matches `special' characters in parameters, the
-# existance of which force quoting of the parameter value.
+# existence of which force quoting of the parameter value.
tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]')
def _formatparam(param, value=None, quote=1):
View
2  django/utils/_threading_local.py
@@ -149,7 +149,7 @@ def __new__(cls, *args, **kw):
raise TypeError("Initialization arguments are not supported")
# We need to create the thread dict in anticipation of
- # __init__ being called, to make sire we don't cal it
+ # __init__ being called, to make sure we don't call it
# again ourselves.
dict = object.__getattribute__(self, '__dict__')
currentThread().__dict__[key] = dict
View
2  docs/modpython.txt
@@ -190,7 +190,7 @@ Error handling
==============
When you use Apache/mod_python, errors will be caught by Django -- in other
-words, they won't propogate to the Apache level and won't appear in the Apache
+words, they won't propagate to the Apache level and won't appear in the Apache
``error_log``.
The exception for this is if something is really wonky in your Django setup. In
View
4 tests/doctest.py
@@ -846,7 +846,7 @@ def find(self, obj, name=None, module=None, globs=None,
if extraglobs is not None:
globs.update(extraglobs)
- # Recursively expore `obj`, extracting DocTests.
+ # Recursively explore `obj`, extracting DocTests.
tests = []
self._find(tests, obj, name, module, source_lines, globs, {})
return tests
@@ -1210,7 +1210,7 @@ def __run(self, test, compileflags, out):
# Process each example.
for examplenum, example in enumerate(test.examples):
- # If REPORT_ONLY_FIRST_FAILURE is set, then supress
+ # If REPORT_ONLY_FIRST_FAILURE is set, then suppress
# reporting after the first failure.
quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and
failures > 0)
View
4 tests/othertests/cache.py
@@ -15,7 +15,7 @@ def m(n):
cache.set("key", "value")
assert cache.get("key") == "value"
-# get with non-existant keys
+# get with non-existent keys
assert cache.get("does not exist") is None
assert cache.get("does not exist", "bang!") == "bang!"
@@ -57,4 +57,4 @@ def m(n):
# expiration
cache.set('expire', 'very quickly', 1)
time.sleep(2)
-assert cache.get("expire") == None
+assert cache.get("expire") == None
View
2  tests/testapp/models/basic.py
@@ -195,7 +195,7 @@ class Article(meta.Model):
API_TESTS += """
-# You can manually specify the primary key when creating a new objet
+# You can manually specify the primary key when creating a new object
>>> a101 = articles.Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))
>>> a101.save()
>>> a101 = articles.get_object(pk=101)
Please sign in to comment.
Something went wrong with that request. Please try again.