aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorStephan Groß2013-05-28 07:39:56 -0700
committerStephan Groß2013-05-28 07:39:56 -0700
commitf6d7f54fc15ed3bb97b1d97ff1ecaf99e933660e (patch)
treea1c18df58b9b8ae459d1c36ff083855e6c942844 /rest_framework/serializers.py
parent22e1950e1cca237e6edeea3ddc9c798b975c6183 (diff)
parent8f35ac4f93c608eaced3f48a46e8922104e09182 (diff)
downloaddjango-rest-framework-f6d7f54fc15ed3bb97b1d97ff1ecaf99e933660e.tar.bz2
Merge pull request #897 from pborreli/typos
Fixed typos
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py4
1 files changed, 2 insertions, 2 deletions
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)