aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTom Christie2014-12-17 16:32:18 +0000
committerTom Christie2014-12-17 16:32:18 +0000
commitdf29641f20c66ac3572d33d6bed23bd0fa3493a6 (patch)
treeca9ae6e43afe4605647d88e9f796ed2413f9d6e5 /docs
parent418108632c57b4aba5389b74916e4fa12d281438 (diff)
parenteeb6e340644eba70b2fd41100db34b159ae6f091 (diff)
downloaddjango-rest-framework-df29641f20c66ac3572d33d6bed23bd0fa3493a6.tar.bz2
Merge pull request #2300 from maryokhin/master
Docs/tutorial import fixes
Diffstat (limited to 'docs')
-rw-r--r--docs/api-guide/serializers.md8
-rw-r--r--docs/tutorial/1-serialization.md2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 137cc9d5..b9f0e7bc 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -22,11 +22,13 @@ The serializers in REST framework work very similarly to Django's `Form` and `Mo
Let's start by creating a simple object we can use for example purposes:
+ from datetime import datetime
+
class Comment(object):
def __init__(self, email, content, created=None):
self.email = email
self.content = content
- self.created = created or datetime.datetime.now()
+ self.created = created or datetime.now()
comment = Comment(email='leila@example.com', content='foo bar')
@@ -61,10 +63,10 @@ At this point we've translated the model instance into Python native datatypes.
Deserialization is similar. First we parse a stream into Python native datatypes...
- from StringIO import StringIO
+ from django.utils.six import BytesIO
from rest_framework.parsers import JSONParser
- stream = StringIO(json)
+ stream = BytesIO(json)
data = JSONParser().parse(stream)
...then we restore those native datatypes into a dictionary of validated data.
diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md
index b1baf0dd..ff507a2b 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -161,8 +161,6 @@ At this point we've translated the model instance into Python native datatypes.
Deserialization is similar. First we parse a stream into Python native datatypes...
- # This import will use either `StringIO.StringIO` or `io.BytesIO`
- # as appropriate, depending on if we're running Python 2 or Python 3.
from django.utils.six import BytesIO
stream = BytesIO(content)