8000 Merge remote-tracking branch 'csev/master' into console-merge · StudyCourse/pythonlearn@f996ade · GitHub
[go: up one dir, main page]
Skip to content

Commit f996ade

Browse files
eah13eah13
committed
Merge remote-tracking branch 'csev/master' into console-merge
2 parents e11d139 + 64a51a1 commit f996ade

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+896
-993
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ friends.sqlite
1717
index.sqlite
1818
gline.js
1919
gword.js
20-
20+
*.sublime*

‎assets/.htaccess‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Options +Indexes
2+
3+
<IfModule headers_module>
4+
Header set Cache-Control "max-age=604800, public"
5+
6+
Header add Access-Control-Allow-Origin "*"
7+
Header add Access-Control-Allow-Headers "origin, x-requested-with, content-type"
8+
Header add Access-Control-Allow-Methods "GET"
9+
</IfModule>

‎assn/gmane/peer1.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"title":"Mailing List Data - Part I",
3+
"description":"In this assignment you will download some of the mailing list data from http://mbox.dr-chuck.net/ and run the data cleaning / modeling process and take some screen shots.",
4+
"grading":"Don't take off points for little mistakes. If they seem to have done the assignment give them full credit. Feel free to make suggestions if there are small mistakes. Please keep your comments positive and useful.",
5+
"solution" : "http://www.dr-chuck.net/pythonlearn/code/gmane.zip",
6+
"parts":[
7+
{
8+
"title":"A screen shot of your SQLiteBrowser showing messages downloaded from mbox.dr-chuck.net into the content.sqlite database",
9+
"type":"image"
10+
},
11+
{
12+
"title":"A screen shot of you running the gmodel.py application to produce the index.sqlite database.",
13+
"type":"image"
14+
},
15+
{
16+
"title":"A screen shot of your SQLiteBrowser showing messages in the index.sqlite database after the gmodel.py has executed.",
17+
"type":"image"
18+
},
19+
{
20+
"title":"A screen shot of you running the gmbasic.py program to compute basic histogram data on the messages you have retrieved.",
21+
"type":"image"
22+
}
23+
],
24+
"totalpoints":10,
25+
"instructorpoints":0,
26+
"peerpoints":4,
27+
"assesspoints":2,
28+
"minassess":3,
29+
"maxassess":10,
30+
"flag":true,
31+
"rating":0,
32+
"gallery":"off"
33+
}

‎assn/gmane/peer2.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"title":"Mailing List Data - Part II",
3+
"description":"In this assignment you will visualize the mailing list data you have downloaded from http://mbox.dr-chuck.net/ and take some screen shots. Important: You do not have to download all of the data - it is completely acceptible to visualize a small subset of the data for this assignment.",
4+
"grading":"Don't take off points for little mistakes. If they seem to have done the assignment give them full credit. Feel free to make suggestions if there are small mistakes. Please keep your comments positive and useful.",
5+
"solution" : "http://www.dr-chuck.net/pythonlearn/code/gmane.zip",
6+
"parts":[
7+
{
8+
"title":"A screen shot of you running the gbasic.py program to compute basic histogram data on the messages you have retrieved.",
9+
"type":"image"
10+
},
11+
{
12+
"title":"A screen shot of word cloud visualization for the messages you have retrieved.",
13+
"type":"image"
14+
},
15+
{
16+
"title":"A screen shot of time line visualization for the messages you have retrieved.",
17+
"type":"image"
18+
},
19+
{
20+
"title":"Optional Challenge: Change the gline.py program to show the message count by month instead of by year and take a screen shot to the by month visualization. You can switch from a by-year to a by-month visualization by changing only a few lines in gline.js. The puzzle is to figure out the smallest change to accomplish the change. If you do not want to do this optional challenge - just upload the above image a second time. " ,
21+
"type":"image"
22+
}
23+
],
24+
"totalpoints":10,
25+
"instructorpoints":0,
26+
"peerpoints":4,
27+
"assesspoints":2,
28+
"minassess":3,
29+
"maxassess":10,
30+
"flag":true,
31+
"rating":0,
32+
"gallery":"off"
33+
}

‎assn/pagerank/peer.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"title":"Page Rank",
3+
"description":"First you will spider 100 pages from http://python-data.dr-chuck.net/ run the page rank algorithm and take some screen shots. Then you will reset the spider process and spider 100 pages from any other site on the Internet, run the page rank alorithm, and take some screen shots.",
4+
"grading":"Don't take off points for little mistakes. If they seem to have done the assignment give them full credit. Feel free to make suggestions if there are small mistakes. Please keep your comments positive and useful.",
5+
"solution" : "http://www.dr-chuck.net/pythonlearn/code/pagerank.zip",
6+
"parts":[
7+
{
8+
"title":"A screen shot of the spdump.py running after you have crawled 100 pages from python-data.dr-chuck.com",
9+
"type":"image"
10+
},
11+
{
12+
"title":"A screen shot of the top 25 pages according to page rank that you crawled from python-data.dr-chuck.com visualized using force.html",
13+
"type":"image"
14+
},
15+
{
16+
"title":"A screen shot of the spdump.py running after you have crawled 100 pages from another web site",
17+
"type":"image"
18+
},
19+
{
20+
"title":"A screen shot of the top 25 pages according to page rank that you crawled from the other web site visualized using force.html",
21+
"type":"image"
22+
}
23+
],
24+
"totalpoints":10,
25+
"instructorpoints":0,
26+
"peerpoints":4,
27+
"assesspoints":2,
28+
"minassess":3,
29+
"maxassess":10,
30+
"flag":true,
31+
"rating":0,
32+
"gallery":"off"
33+
}

‎book.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ <h1>Python for Informatics: Exploring Information</h1>
4747
<ul>
4848
<li>PDF
4949
<ul>
50-
<li><a href="http://do1.dr-chuck.com/py4inf/EN-us/book.pdf" target="_blank">English</a></li>
51-
<li><a href="http://do1.dr-chuck.com/py4inf/ES-es/book.pdf" target="_blank">Spanish</a> from <a href="https://twitter.com/fertardio" target="_blank">Fernando Tardío.</a></li>
50+
<li><a href="http://do1.dr-chuck.net/py4inf/EN-us/book.pdf" target="_blank">English</a></li>
51+
<li><a href="http://do1.dr-chuck.net/py4inf/ES-es/book.pdf" target="_blank">Spanish</a> from <a href="https://twitter.com/fertardio" target="_blank">Fernando Tardío.</a></li>
5252
<li><a href="translations/KO/book_009_ko.pdf" target="_blank">Korean</a> from
5353
<a href="http://www.xwmooc.net/python/" target="_new">Victor KC. Lee</a></li>
5454
<li><a href="http://fanwscu.gitbooks.io/py4inf-zh-cn/" target="_blank">Chinese (Simplified)</a> from Wei Fan</li>

‎book.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<a href="#">English</a>
3434
<ul class="menu vertical nested">
3535
<li><a href="http://amzn.to/1KkULF3" target="_blank">Amazon</a> or <a href="http://amzn.to/1hLcoBy" target="_blank">Kindle Store</a> (Python for Informatics: Exploring Information)</li>
36-
<li><a href="http://do1.dr-chuck.com/py4inf/EN-us/book.pdf" target="_blank">PDF</a></li>
36+
<li><a href="http://do1.dr-chuck.net/py4inf/EN-us/book.pdf" target="_blank">PDF</a></li>
3737
<li><a href="book_270.epub" target="_blank">EPUB</a></li>
3838
<li><a href="html-270/" target="_blank">HTML</a></li>
3939
<li><a href="html_270.zip" target="_blank">Download HTML in a ZIP</a></li>
@@ -45,7 +45,7 @@
4545
<a href="#">Spanish</a>
4646
<ul class="menu vertical nested">
4747
<li><a href="http://amzn.to/1KkV42z" target="_blank">Amazon</a> or <a href="http://amzn.to/1fNOnbd" target="_blank">Kindle Store</a> (Python para Informáticos: Explorando la información)</li>
48-
<li><a href="http://do1.dr-chuck.com/py4inf/ES-es/book.pdf" target="_blank">PDF</a> from <a href="https://twitter.com/fertardio" target="_blank">Fernando Tardío</a></li>
48+
<li><a href="http://do1.dr-chuck.net/py4inf/ES-es/book.pdf" target="_blank">PDF</a> from <a href="https://twitter.com/fertardio" target="_blank">Fernando Tardío</a></li>
4949
<li><a href="translations/ES/book_272_es4.epub" target="_blank">EPUB</a></li>
5050
</ul>
5151
</li>

‎book/01-intro.mkd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
% Python 3.0 For Informatics : Exploring Information
2-
% Charles Severance
3-
% This book is being converted from Python 2.0 to Python 3.0. If you want to help see http://www.pythonlearn.com/book/
1+
% Python for Everybody
2+
% Exploring Information using Python 3.0
3+
% Charles R. Severance
44

55
Why should you learn to write programs?
66
=======================================
@@ -316,7 +316,7 @@ This is looking much better, so you try to communicate some more:
316316
File "<stdin>", line 1
317317
print 'We will have a feast tonight unless you say
318318
^
319-
SyntaxError: EOL while scanning string literal
319+
SyntaxError: Missing parentheses in call to 'print'
320320
>>>
321321
~~~~
322322

@@ -509,7 +509,7 @@ of the file. In a Unix or Windows command window, you would type
509509

510510
~~~~ {.bash}
511511
csev$ cat hello.py
512-
print 'Hello world!'
512+
print('Hello world!')
513513
csev$ python hello.py
514514
Hello world!
515515
csev$

‎book/03-conditional.mkd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ This flexibility can be useful, but there are some subtleties to it that
103103
might be confusing. You might want to avoid it until you are sure you
104104
know what you are doing.
105105

106-
Conditional execution {#conditional execution}
106+
Conditional execution
107107
---------------------
108108

109109
\index{conditional statement}
@@ -171,7 +171,7 @@ Small
171171
>>>
172172
~~~~
173173

174-
Alternative execution {#alternative execution}
174+
Alternative execution
175175
---------------------
176176

177177
\index{alternative execution}
@@ -299,7 +299,7 @@ if 0 < x and x < 10:
299299
print('x is a positive single-digit number.')
300300
~~~~
301301

302-
Catching exceptions using try and except {#catch1}
302+
Catching exceptions using try and except
303303
----------------------------------------
304304

305305
Earlier we saw a code segment where we used the `raw_input` and
@@ -477,7 +477,7 @@ In the second expression, we say that `y != 0` acts as a
477477
*guard* to insure that we only execute `(x/y)`
478478
if `y` is non-zero.
479479

480-
Debugging {#whitespace}
480+
Debugging
481481
---------
482482

483483
\index{debugging}

‎book/04-functions.mkd‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
Functions {#funcchap}
1+
2+
Functions
23
=========
34

4-
Function calls {#functionchap}
5+
Function calls
56
--------------
67

78
\index{function call}
@@ -486,7 +487,7 @@ What's the moral of this sordid tale? When you read a program, you don't
486487
always want to read from top to bottom. Sometimes it makes more sense if
487488
you follow the flow of execution.
488489

489-
Parameters and arguments {#parameters}
490+
Parameters and arguments
490491
------------------------
491492

492493
\index{parameter}
@@ -678,7 +679,7 @@ finds the smallest in a list of values and we will present it to you as
678679
a function named `min` which takes a list of values as its
679680
argument and returns the smallest value in the list.
680681

681-
Debugging {#editor}
682+
Debugging
682683
---------
683684

684685
\index{debugging}

0 commit comments

Comments
 (0)
0