Skip to content

Commit 08b9e5c

Browse files
committed
update the django intro file to reflect the new 1.7 reality
1 parent 7bae547 commit 08b9e5c

File tree

4 files changed

+326
-722
lines changed

4 files changed

+326
-722
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[
2+
{
3+
"pk": 1,
4+
"model": "auth.user",
5+
"fields": {
6+
"username": "admin",
7+
"first_name": "Mr.",
8+
"last_name": "Administrator",
9+
"is_active": true,
10+
"is_superuser": true,
11+
"is_staff": true,
12+
"last_login": "2013-05-24T05:35:58.628Z",
13+
"groups": [],
14+
"user_permissions": [],
15+
"password": "pbkdf2_sha256$10000$1rQazFNdOfFt$6aw/uIrv2uASkZ7moXMTajSN+ySYuowBnbP6ILNQntE=",
16+
"email": "[email protected]",
17+
"date_joined": "2013-05-24T05:35:58.628Z"
18+
}
19+
},
20+
{
21+
"pk": 2,
22+
"model": "auth.user",
23+
"fields": {
24+
"username": "noname",
25+
"first_name": "",
26+
"last_name": "",
27+
"is_active": true,
28+
"is_superuser": true,
29+
"is_staff": true,
30+
"last_login": "2013-05-24T05:35:58.628Z",
31+
"groups": [],
32+
"user_permissions": [],
33+
"password": "pbkdf2_sha256$10000$1rQazFNdOfFt$6aw/uIrv2uASkZ7moXMTajSN+ySYuowBnbP6ILNQntE=",
34+
"email": "[email protected]",
35+
"date_joined": "2013-05-24T05:35:58.628Z"
36+
}
37+
}
38+
]

source/outline.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,20 +169,22 @@ build a script that can produce derived meaning out of data we find online.
169169
References
170170
**********
171171

172+
* `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/bs4/doc/>`_
173+
* `requests <http://requests.readthedocs.org/en/latest/>`_
174+
* `json <http://docs.python.org/2/library/json.html>`_
175+
* `geocoder <http://geocoder.readthedocs.org/en/latest/>`_
172176
* `httplib <http://docs.python.org/2/library/httplib.html>`_
173177
* `htmlparser <http://docs.python.org/2/library/htmlparser.html>`_
174178
* `xmlrpclib <http://docs.python.org/2/library/xmlrpclib.html>`_
175179
* `DocXMLRPCServer <http://docs.python.org/2/library/docxmlrpcserver.html>`_
176-
* `json <http://docs.python.org/2/library/json.html>`_
177-
178180

179181

180182
Preparation for Session 8
181183
*************************
182184

183185
Please walk through this tutorial before session 8 begins.
184186

185-
* `An Introduction to Django <presentations/django_intro-plain.html>`_
187+
* `An Introduction to Django <presentations/django_intro.html>`_
186188

187189

188190
Session 8 - Basic Django
@@ -200,7 +202,7 @@ blog app in Django. We'll learn how to use the tools Django provides to explore
200202
and interact with your models while designing them. We'll also get a brief
201203
introduction to the Django admin, Django's *killer feature*.
202204

203-
.. _get started building: presentations/django_intro-plain.html
205+
.. _get started building: presentations/django_intro.html
204206

205207

206208
Along the way, we'll build a nicely functional blog application. We'll learn

0 commit comments

Comments
 (0)