aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorPascal Borreli2013-05-28 15:09:23 +0100
committerPascal Borreli2013-05-28 15:09:23 +0100
commit8f35ac4f93c608eaced3f48a46e8922104e09182 (patch)
tree55b394b57fc7b0e40283d89dc23dd0b41dfc074d /rest_framework
parent7123f0b1e6b29778c41476341bd2370f60c279fa (diff)
downloaddjango-rest-framework-8f35ac4f93c608eaced3f48a46e8922104e09182.tar.bz2
Fixed typos
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/decorators.py4
-rw-r--r--rest_framework/response.py2
-rw-r--r--rest_framework/serializers.py4
-rw-r--r--rest_framework/templatetags/rest_framework.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 81e585e1..25bbbb17 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -1,5 +1,5 @@
"""
-The most imporant decorator in this module is `@api_view`, which is used
+The most important decorator in this module is `@api_view`, which is used
for writing function-based views with REST framework.
There are also various decorators for setting the API policies on function
@@ -40,7 +40,7 @@ def api_view(http_method_names):
# api_view applied with eg. string instead of list of strings
assert isinstance(http_method_names, (list, tuple)), \
- '@api_view expected a list of strings, recieved %s' % type(http_method_names).__name__
+ '@api_view expected a list of strings, received %s' % type(http_method_names).__name__
allowed_methods = set(http_method_names) | set(('options',))
WrappedAPIView.http_method_names = [method.lower() for method in allowed_methods]
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 110ccb13..3ee52ae0 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -1,5 +1,5 @@
"""
-The Response class in REST framework is similiar to HTTPResponse, except that
+The Response class in REST framework is similar to HTTPResponse, except that
it is initialized with unrendered data, instead of a pre-rendered string.
The appropriate renderer is called during Django's template response rendering.
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 5be07fb7..3e5c366e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -25,7 +25,7 @@ from rest_framework.compat import get_concrete_model, six
#
# example_field = serializers.CharField(...)
#
-# This helps keep the seperation between model fields, form fields, and
+# This helps keep the separation between model fields, form fields, and
# serializer fields more explicit.
from rest_framework.relations import *
@@ -58,7 +58,7 @@ class DictWithMetadata(dict):
def __getstate__(self):
"""
Used by pickle (e.g., caching).
- Overriden to remove the metadata from the dict, since it shouldn't be
+ Overridden to remove the metadata from the dict, since it shouldn't be
pickled and may in some instances be unpickleable.
"""
return dict(self)
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index c86b6456..e9c1cdd5 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -15,7 +15,7 @@ register = template.Library()
# When 1.3 becomes unsupported by REST framework, we can instead start to
# use the {% load staticfiles %} tag, remove the following code,
-# and add a dependancy that `django.contrib.staticfiles` must be installed.
+# and add a dependency that `django.contrib.staticfiles` must be installed.
# Note: We can't put this into the `compat` module because the compat import
# from rest_framework.compat import ...