Merge branch 'master' into patch-1

csev · web-flow · commit 48c90d110e01 · 2018-03-06T13:38:04.000-05:00
diff --git a/assn/gmane/peer2.json b/assn/gmane/peer2.json
@@ -17,7 +17,7 @@
       "type":"image"
     },
     {
-      "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.py.  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. " ,
+      "title":"Optional Challenge: Change the gline.py program to show the message count by year instead of by month and take a screen shot of the by year visualization. You can switch from a by-month to a by-year visualization by changing only a few lines in gline.py.  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. " ,
       "type":"image"
     }
   ],
diff --git a/assn/pagerank/peer.json b/assn/pagerank/peer.json
@@ -1,6 +1,6 @@
 {
   "title":"Page Rank",
-  "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.",
+  "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. Each site is a pair of screenshots spdump.py & force.html.",
   "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.",
   "solution" : "http://www.dr-chuck.net/pythonlearn/code/pagerank.zip",
   "parts":[
diff --git a/book3/AB-copyright.mkd b/book3/AB-copyright.mkd
@@ -47,7 +47,7 @@ benefit to students or teachers that will accrue as a result of the new
 work.
 
 Charles Severance\
-www.dr-chuck.com\
+www.dr-chuck.com \
 Ann Arbor, MI, USA\
 September 9, 2013
 
diff --git a/code3/geodata/where.html b/code3/geodata/where.html
@@ -9,11 +9,6 @@
     <script src="https://maps.google.cn/maps/api/js" type="text/javascript"></script> -->
     
     <script src="https://maps.googleapis.com/maps/api/js"></script>
-
-<!-- About MarkerClusterer https://github.com/googlemaps/js-marker-clusterer -->
-<!-- Get the raw version of Github script -->
-    <script src="http://rawgit.com/googlemaps/js-marker-clusterer/gh-pages/src/markerclusterer.js"></script>
-    
     <script src="where.js"></script>
     <script>
 
diff --git a/code3/gmane/gline.py b/code3/gmane/gline.py
@@ -50,7 +50,7 @@
 # print months
 
 fhand = open('gline.js','w')
-fhand.write("gline = [ ['Year'")
+fhand.write("gline = [ ['Month'")
 for org in orgs:
     fhand.write(",'"+org+"'")
 fhand.write("]")
diff --git a/code3/socket1.py b/code3/socket1.py
@@ -6,7 +6,7 @@
 mysock.send(cmd)
 
 while True:
-    data = mysock.recv(20)
+    data = mysock.recv(512)
     if (len(data) < 1):
         break
     print(data.decode(),end='')
diff --git a/code3/socket2.py b/code3/socket2.py
@@ -1,12 +1,15 @@
 import socket
 
+# This is using HTML 1.0 - not all servers support the oldest protocol
+# Try http://data.pr4e.org/romeo.txt is your server fails.
+
 url = input('Enter: ')
 words = url.split('/')
 host = words[2]
 
 mysock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 mysock.connect((host, 80))
-mysock.send(('GET '+url+' HTTP/1.0\n\n').encode())
+mysock.send(('GET '+url+' HTTP/1.0\r\n\r\n').encode())
 
 while True:
     data = mysock.recv(512)

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"type":"image"`
`18`	`18`	`},`
`19`	`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.py. 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. " ,`
	`20`	`+ "title":"Optional Challenge: Change the gline.py program to show the message count by year instead of by month and take a screen shot of the by year visualization. You can switch from a by-month to a by-year visualization by changing only a few lines in gline.py. 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`	`21`	`"type":"image"`
`22`	`22`	`}`
`23`	`23`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`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.",`
	`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. Each site is a pair of screenshots spdump.py & force.html.",`
`4`	`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`	`5`	`"solution" : "http://www.dr-chuck.net/pythonlearn/code/pagerank.zip",`
`6`	`6`	`"parts":[`