Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.5.x] Fixed spelling errors

Backport of ec04fd1 from master
  • Loading branch information...
commit d1b7bd030b1db111e1a3505b1fc029ab964382cc 1 parent 149150d
Gavin Wahl authored timgraham committed
12  django/contrib/admin/options.py
@@ -248,7 +248,7 @@ def lookup_allowed(self, lookup, value):
248 248
             parts.pop()
249 249
 
250 250
         # Special case -- foo__id__exact and foo__id queries are implied
251  
-        # if foo has been specificially included in the lookup list; so
  251
+        # if foo has been specifically included in the lookup list; so
252 252
         # drop __id if it is the last part. However, first we need to find
253 253
         # the pk attribute name.
254 254
         rel_name = None
@@ -256,7 +256,7 @@ def lookup_allowed(self, lookup, value):
256 256
             try:
257 257
                 field, _, _, _ = model._meta.get_field_by_name(part)
258 258
             except FieldDoesNotExist:
259  
-                # Lookups on non-existants fields are ok, since they're ignored
  259
+                # Lookups on non-existent fields are ok, since they're ignored
260 260
                 # later.
261 261
                 return True
262 262
             if hasattr(field, 'rel'):
@@ -278,7 +278,7 @@ def lookup_allowed(self, lookup, value):
278 278
     def has_add_permission(self, request):
279 279
         """
280 280
         Returns True if the given request has permission to add an object.
281  
-        Can be overriden by the user in subclasses.
  281
+        Can be overridden by the user in subclasses.
282 282
         """
283 283
         opts = self.opts
284 284
         return request.user.has_perm(opts.app_label + '.' + opts.get_add_permission())
@@ -289,7 +289,7 @@ def has_change_permission(self, request, obj=None):
289 289
         Django model instance, the default implementation doesn't examine the
290 290
         `obj` parameter.
291 291
 
292  
-        Can be overriden by the user in subclasses. In such case it should
  292
+        Can be overridden by the user in subclasses. In such case it should
293 293
         return True if the given request has permission to change the `obj`
294 294
         model instance. If `obj` is None, this should return True if the given
295 295
         request has permission to change *any* object of the given type.
@@ -303,7 +303,7 @@ def has_delete_permission(self, request, obj=None):
303 303
         Django model instance, the default implementation doesn't examine the
304 304
         `obj` parameter.
305 305
 
306  
-        Can be overriden by the user in subclasses. In such case it should
  306
+        Can be overridden by the user in subclasses. In such case it should
307 307
         return True if the given request has permission to delete the `obj`
308 308
         model instance. If `obj` is None, this should return True if the given
309 309
         request has permission to delete *any* object of the given type.
@@ -575,7 +575,7 @@ def get_actions(self, request):
575 575
         Return a dictionary mapping the names of all actions for this
576 576
         ModelAdmin to a tuple of (callable, name, description) for each action.
577 577
         """
578  
-        # If self.actions is explicitally set to None that means that we don't
  578
+        # If self.actions is explicitly set to None that means that we don't
579 579
         # want *any* actions enabled on this page.
580 580
         from django.contrib.admin.views.main import IS_POPUP_VAR
581 581
         if self.actions is None or IS_POPUP_VAR in request.GET:
2  django/contrib/admin/sites.py
@@ -129,7 +129,7 @@ def disable_action(self, name):
129 129
 
130 130
     def get_action(self, name):
131 131
         """
132  
-        Explicitally get a registered global action wheather it's enabled or
  132
+        Explicitly get a registered global action whether it's enabled or
133 133
         not. Raises KeyError for invalid names.
134 134
         """
135 135
         return self._global_actions[name]
2  django/db/models/base.py
@@ -895,7 +895,7 @@ def unique_error_message(self, model_class, unique_check):
895 895
     def full_clean(self, exclude=None):
896 896
         """
897 897
         Calls clean_fields, clean, and validate_unique, on the model,
898  
-        and raises a ``ValidationError`` for any errors that occured.
  898
+        and raises a ``ValidationError`` for any errors that occurred.
899 899
         """
900 900
         errors = {}
901 901
         if exclude is None:
2  django/forms/formsets.py
@@ -111,7 +111,7 @@ def initial_form_count(self):
111 111
         if self.is_bound:
112 112
             return self.management_form.cleaned_data[INITIAL_FORM_COUNT]
113 113
         else:
114  
-            # Use the length of the inital data if it's there, 0 otherwise.
  114
+            # Use the length of the initial data if it's there, 0 otherwise.
115 115
             initial_forms = self.initial and len(self.initial) or 0
116 116
             if initial_forms > self.max_num >= 0:
117 117
                 initial_forms = self.max_num
2  django/test/html.py
@@ -222,7 +222,7 @@ def parse_html(html):
222 222
     """
223 223
     Takes a string that contains *valid* HTML and turns it into a Python object
224 224
     structure that can be easily compared against other HTML on semantic
225  
-    equivilance. Syntactical differences like which quotation is used on
  225
+    equivalence. Syntactical differences like which quotation is used on
226 226
     arguments will be ignored.
227 227
 
228 228
     """
2  django/utils/http.py
@@ -217,7 +217,7 @@ def parse_etags(etag_str):
217 217
 
218 218
 def quote_etag(etag):
219 219
     """
220  
-    Wraps a string in double quotes escaping contents as necesary.
  220
+    Wraps a string in double quotes escaping contents as necessary.
221 221
     """
222 222
     return '"%s"' % etag.replace('\\', '\\\\').replace('"', '\\"')
223 223
 
2  docs/_ext/djangodocs.py
@@ -120,7 +120,7 @@ def depart_literal_block(self, node):
120 120
     # which is a bit less obvious that I'd like.
121 121
     #
122 122
     # FIXME: these messages are all hardcoded in English. We need to change
123  
-    # that to accomodate other language docs, but I can't work out how to make
  123
+    # that to accommodate other language docs, but I can't work out how to make
124 124
     # that work.
125 125
     #
126 126
     version_text = {
2  docs/_ext/literals_to_xrefs.py
@@ -110,7 +110,7 @@ def fixliterals(fname):
110 110
     
111 111
 #
112 112
 # The following is taken from django.utils.termcolors and is copied here to
113  
-# avoid the dependancy.
  113
+# avoid the dependency.
114 114
 #
115 115
 
116 116
 

0 notes on commit d1b7bd0

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