aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorMarko Tibold2012-10-30 00:30:52 +0100
committerMarko Tibold2012-10-30 00:30:52 +0100
commit4d90bb4af4e565f156ca5d84eb205cbb63810b46 (patch)
treee989727bd9bdd06877b48e32491a9d068cd9b4c3 /rest_framework
parentb6c90c0d684cd036a2ce874fd9ace7a8a2bfda2f (diff)
downloaddjango-rest-framework-4d90bb4af4e565f156ca5d84eb205cbb63810b46.tar.bz2
Fix some typos.
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/fields.py4
-rw-r--r--rest_framework/generics.py2
-rw-r--r--rest_framework/serializers.py2
-rw-r--r--rest_framework/throttling.py2
-rw-r--r--rest_framework/views.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index f9de7cf9..067b1087 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -43,7 +43,7 @@ class Field(object):
Called to set up a field prior to field_to_native or field_from_native.
parent - The parent serializer.
- model_field - The model field this field corrosponds to, if one exists.
+ model_field - The model field this field corresponds to, if one exists.
"""
self.parent = parent
self.root = parent.root or parent
@@ -197,7 +197,7 @@ class WritableField(Field):
class ModelField(WritableField):
"""
- A generic field that can be used against an arbirtrary model field.
+ A generic field that can be used against an arbitrary model field.
"""
def __init__(self, *args, **kwargs):
try:
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 190a5f79..27540a57 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -1,5 +1,5 @@
"""
-Generic views that provide commmonly needed behaviour.
+Generic views that provide commonly needed behaviour.
"""
from rest_framework import views, mixins
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ce04b3e2..1cfcf103 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -279,7 +279,7 @@ class BaseSerializer(Field):
def errors(self):
"""
Run deserialization and return error data,
- setting self.object if no errors occured.
+ setting self.object if no errors occurred.
"""
if self._errors is None:
obj = self.from_native(self.init_data)
diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 6860e6b9..8fe64248 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -16,7 +16,7 @@ class BaseThrottle(object):
def wait(self):
"""
- Optionally, return a recommeded number of seconds to wait before
+ Optionally, return a recommended number of seconds to wait before
the next request.
"""
return None
diff --git a/rest_framework/views.py b/rest_framework/views.py
index c721be3c..71e1fe6c 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -218,7 +218,7 @@ class APIView(View):
def get_throttles(self):
"""
- Instantiates and returns the list of thottles that this view uses.
+ Instantiates and returns the list of throttles that this view uses.
"""
return [throttle() for throttle in self.throttle_classes]