Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Adrian Holovaty authored April 12, 2006
2  django/contrib/admin/templatetags/admin_list.py
@@ -79,7 +79,7 @@ def result_headers(cl):
79 79
             if field_name == '__repr__':
80 80
                 header = lookup_opts.verbose_name
81 81
             else:
82  
-                func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propogate.
  82
+                func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propagate.
83 83
                 try:
84 84
                     header = func.short_description
85 85
                 except AttributeError:
2  django/core/meta/__init__.py
@@ -1733,7 +1733,7 @@ def manipulator_init(opts, add, change, self, obj_key=None, follow=None):
1733 1733
             if opts.one_to_one_field:
1734 1734
                 # Sanity check -- Make sure the "parent" object exists.
1735 1735
                 # For example, make sure the Place exists for the Restaurant.
1736  
-                # Let the ObjectDoesNotExist exception propogate up.
  1736
+                # Let the ObjectDoesNotExist exception propagate up.
1737 1737
                 lookup_kwargs = opts.one_to_one_field.rel.limit_choices_to
1738 1738
                 lookup_kwargs['%s__exact' % opts.one_to_one_field.rel.field_name] = obj_key
1739 1739
                 _ = opts.one_to_one_field.rel.to.get_model_module().get_object(**lookup_kwargs)
2  django/core/meta/fields.py
@@ -80,7 +80,7 @@ def __repr__(self):
80 80
 
81 81
 # A guide to Field parameters:
82 82
 #
83  
-#   * name:      The name of the field specifed in the model.
  83
+#   * name:      The name of the field specified in the model.
84 84
 #   * attname:   The attribute to use on the model object. This is the same as
85 85
 #                "name", except in the case of ForeignKeys, where "_id" is
86 86
 #                appended.
2  django/core/servers/basehttp.py
@@ -46,7 +46,7 @@ def next(self):
46 46
         raise StopIteration
47 47
 
48 48
 # Regular expression that matches `special' characters in parameters, the
49  
-# existance of which force quoting of the parameter value.
  49
+# existence of which force quoting of the parameter value.
50 50
 tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]')
51 51
 
52 52
 def _formatparam(param, value=None, quote=1):
2  django/utils/_threading_local.py
@@ -149,7 +149,7 @@ def __new__(cls, *args, **kw):
149 149
             raise TypeError("Initialization arguments are not supported")
150 150
 
151 151
         # We need to create the thread dict in anticipation of
152  
-        # __init__ being called, to make sire we don't cal it
  152
+        # __init__ being called, to make sure we don't call it
153 153
         # again ourselves.
154 154
         dict = object.__getattribute__(self, '__dict__')
155 155
         currentThread().__dict__[key] = dict
2  docs/modpython.txt
@@ -190,7 +190,7 @@ Error handling
190 190
 ==============
191 191
 
192 192
 When you use Apache/mod_python, errors will be caught by Django -- in other
193  
-words, they won't propogate to the Apache level and won't appear in the Apache
  193
+words, they won't propagate to the Apache level and won't appear in the Apache
194 194
 ``error_log``.
195 195
 
196 196
 The exception for this is if something is really wonky in your Django setup. In
4  tests/doctest.py
@@ -846,7 +846,7 @@ def find(self, obj, name=None, module=None, globs=None,
846 846
         if extraglobs is not None:
847 847
             globs.update(extraglobs)
848 848
 
849  
-        # Recursively expore `obj`, extracting DocTests.
  849
+        # Recursively explore `obj`, extracting DocTests.
850 850
         tests = []
851 851
         self._find(tests, obj, name, module, source_lines, globs, {})
852 852
         return tests
@@ -1210,7 +1210,7 @@ def __run(self, test, compileflags, out):
1210 1210
         # Process each example.
1211 1211
         for examplenum, example in enumerate(test.examples):
1212 1212
 
1213  
-            # If REPORT_ONLY_FIRST_FAILURE is set, then supress
  1213
+            # If REPORT_ONLY_FIRST_FAILURE is set, then suppress
1214 1214
             # reporting after the first failure.
1215 1215
             quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and
1216 1216
                      failures > 0)
4  tests/othertests/cache.py
@@ -15,7 +15,7 @@ def m(n):
15 15
 cache.set("key", "value")
16 16
 assert cache.get("key") == "value"
17 17
 
18  
-# get with non-existant keys
  18
+# get with non-existent keys
19 19
 assert cache.get("does not exist") is None
20 20
 assert cache.get("does not exist", "bang!") == "bang!"
21 21
 
@@ -57,4 +57,4 @@ def m(n):
57 57
 # expiration
58 58
 cache.set('expire', 'very quickly', 1)
59 59
 time.sleep(2)
60  
-assert cache.get("expire") == None
  60
+assert cache.get("expire") == None
2  tests/testapp/models/basic.py
@@ -195,7 +195,7 @@ class Article(meta.Model):
195 195
 
196 196
 API_TESTS += """
197 197
 
198  
-# You can manually specify the primary key when creating a new objet
  198
+# You can manually specify the primary key when creating a new object
199 199
 >>> a101 = articles.Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))
200 200
 >>> a101.save()
201 201
 >>> a101 = articles.get_object(pk=101)

0 notes on commit 00b3891

Please sign in to comment.
Something went wrong with that request. Please try again.