Merge pull request #2300 from maryokhin/master

Docs/tutorial import fixes
This commit is contained in:
Tom Christie 2014-12-17 16:32:18 +00:00
commit df29641f20
2 changed files with 5 additions and 5 deletions

View File

@ -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: Let's start by creating a simple object we can use for example purposes:
from datetime import datetime
class Comment(object): class Comment(object):
def __init__(self, email, content, created=None): def __init__(self, email, content, created=None):
self.email = email self.email = email
self.content = content 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') 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... 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 from rest_framework.parsers import JSONParser
stream = StringIO(json) stream = BytesIO(json)
data = JSONParser().parse(stream) data = JSONParser().parse(stream)
...then we restore those native datatypes into a dictionary of validated data. ...then we restore those native datatypes into a dictionary of validated data.

View File

@ -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... 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 from django.utils.six import BytesIO
stream = BytesIO(content) stream = BytesIO(content)