aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-12-17 16:32:42 +0000
committerTom Christie2014-12-17 16:32:42 +0000
commita0a601301ff0a42d1e0905d29194e638690f32bb (patch)
tree1e71a36ef3ffe78ea68385dbc3c246102a5aa490
parent760da25c6018eff02b3aab33dc6fea7c93881d9f (diff)
downloaddjango-rest-framework-a0a601301ff0a42d1e0905d29194e638690f32bb.tar.bz2
Update documentation
-rw-r--r--api-guide/serializers/index.html10
-rw-r--r--tutorial/1-serialization/index.html4
2 files changed, 7 insertions, 7 deletions
diff --git a/api-guide/serializers/index.html b/api-guide/serializers/index.html
index 54888896..4c03b25f 100644
--- a/api-guide/serializers/index.html
+++ b/api-guide/serializers/index.html
@@ -562,11 +562,13 @@ will take some serious design work.</p>
<p>The serializers in REST framework work very similarly to Django's <code>Form</code> and <code>ModelForm</code> classes. We provide a <code>Serializer</code> class which gives you a powerful, generic way to control the output of your responses, as well as a <code>ModelSerializer</code> class which provides a useful shortcut for creating serializers that deal with model instances and querysets.</p>
<h2 id="declaring-serializers">Declaring Serializers</h2>
<p>Let's start by creating a simple object we can use for example purposes:</p>
-<pre><code>class Comment(object):
+<pre><code>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')
</code></pre>
@@ -594,10 +596,10 @@ json
</code></pre>
<h2 id="deserializing-objects">Deserializing objects</h2>
<p>Deserialization is similar. First we parse a stream into Python native datatypes...</p>
-<pre><code>from StringIO import StringIO
+<pre><code>from django.utils.six import BytesIO
from rest_framework.parsers import JSONParser
-stream = StringIO(json)
+stream = BytesIO(json)
data = JSONParser().parse(stream)
</code></pre>
<p>...then we restore those native datatypes into a dictionary of validated data.</p>
diff --git a/tutorial/1-serialization/index.html b/tutorial/1-serialization/index.html
index 5682989c..0561fab1 100644
--- a/tutorial/1-serialization/index.html
+++ b/tutorial/1-serialization/index.html
@@ -533,9 +533,7 @@ content
# '{"pk": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}'
</code></pre>
<p>Deserialization is similar. First we parse a stream into Python native datatypes...</p>
-<pre><code># 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
+<pre><code>from django.utils.six import BytesIO
stream = BytesIO(content)
data = JSONParser().parse(stream)