Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed spelling errors

  • Loading branch information...
commit ec04fd1344bda8067404b720ce48b01eb3546c6e 1 parent e081601
Gavin Wahl authored
12  django/contrib/admin/options.py
@@ -276,7 +276,7 @@ def lookup_allowed(self, lookup, value):
276 276
             parts.pop()
277 277
 
278 278
         # Special case -- foo__id__exact and foo__id queries are implied
279  
-        # if foo has been specificially included in the lookup list; so
  279
+        # if foo has been specifically included in the lookup list; so
280 280
         # drop __id if it is the last part. However, first we need to find
281 281
         # the pk attribute name.
282 282
         rel_name = None
@@ -284,7 +284,7 @@ def lookup_allowed(self, lookup, value):
284 284
             try:
285 285
                 field, _, _, _ = model._meta.get_field_by_name(part)
286 286
             except FieldDoesNotExist:
287  
-                # Lookups on non-existants fields are ok, since they're ignored
  287
+                # Lookups on non-existent fields are ok, since they're ignored
288 288
                 # later.
289 289
                 return True
290 290
             if hasattr(field, 'rel'):
@@ -306,7 +306,7 @@ def lookup_allowed(self, lookup, value):
306 306
     def has_add_permission(self, request):
307 307
         """
308 308
         Returns True if the given request has permission to add an object.
309  
-        Can be overriden by the user in subclasses.
  309
+        Can be overridden by the user in subclasses.
310 310
         """
311 311
         opts = self.opts
312 312
         return request.user.has_perm(opts.app_label + '.' + opts.get_add_permission())
@@ -317,7 +317,7 @@ def has_change_permission(self, request, obj=None):
317 317
         Django model instance, the default implementation doesn't examine the
318 318
         `obj` parameter.
319 319
 
320  
-        Can be overriden by the user in subclasses. In such case it should
  320
+        Can be overridden by the user in subclasses. In such case it should
321 321
         return True if the given request has permission to change the `obj`
322 322
         model instance. If `obj` is None, this should return True if the given
323 323
         request has permission to change *any* object of the given type.
@@ -331,7 +331,7 @@ def has_delete_permission(self, request, obj=None):
331 331
         Django model instance, the default implementation doesn't examine the
332 332
         `obj` parameter.
333 333
 
334  
-        Can be overriden by the user in subclasses. In such case it should
  334
+        Can be overridden by the user in subclasses. In such case it should
335 335
         return True if the given request has permission to delete the `obj`
336 336
         model instance. If `obj` is None, this should return True if the given
337 337
         request has permission to delete *any* object of the given type.
@@ -601,7 +601,7 @@ def get_actions(self, request):
601 601
         Return a dictionary mapping the names of all actions for this
602 602
         ModelAdmin to a tuple of (callable, name, description) for each action.
603 603
         """
604  
-        # If self.actions is explicitally set to None that means that we don't
  604
+        # If self.actions is explicitly set to None that means that we don't
605 605
         # want *any* actions enabled on this page.
606 606
         from django.contrib.admin.views.main import IS_POPUP_VAR
607 607
         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
@@ -911,7 +911,7 @@ def unique_error_message(self, model_class, unique_check):
911 911
     def full_clean(self, exclude=None):
912 912
         """
913 913
         Calls clean_fields, clean, and validate_unique, on the model,
914  
-        and raises a ``ValidationError`` for any errors that occured.
  914
+        and raises a ``ValidationError`` for any errors that occurred.
915 915
         """
916 916
         errors = {}
917 917
         if exclude is None:
2  django/forms/formsets.py
@@ -118,7 +118,7 @@ def initial_form_count(self):
118 118
         if self.is_bound:
119 119
             return self.management_form.cleaned_data[INITIAL_FORM_COUNT]
120 120
         else:
121  
-            # Use the length of the inital data if it's there, 0 otherwise.
  121
+            # Use the length of the initial data if it's there, 0 otherwise.
122 122
             initial_forms = self.initial and len(self.initial) or 0
123 123
         return initial_forms
124 124
 
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 ec04fd1

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