Merge branch 'master' of https://github.com/REMitchell/python-scraping

Author: Ryan Mitchell

chapter5/2-createCsv.py

@@ -1,11 +1,11 @@
 import csv
 #from os import open
 
-csvFile = open("../files/test.csv", 'w+')
+csvFile = open("../files/test.csv", 'w+', newline='')
 try:
     writer = csv.writer(csvFile)
     writer.writerow(('number', 'number plus 2', 'number times 2'))
     for i in range(10):
         writer.writerow( (i, i+2, i*2))
 finally:
-    csvFile.close()
+    csvFile.close()

chapter5/3-scrapeCsv.py

@@ -8,13 +8,13 @@
 table = bsObj.findAll("table",{"class":"wikitable"})[0]
 rows = table.findAll("tr")
 
-csvFile = open("files/editors.csv", 'wt')
+csvFile = open("files/editors.csv", 'wt', newline='', encoding='utf-8')
 writer = csv.writer(csvFile)
 try:
 	for row in rows:
 		csvRow = []
 		for cell in row.findAll(['td', 'th']):
 			csvRow.append(cell.get_text())
-			writer.writerow(csvRow)
+		writer.writerow(csvRow)
 finally:
     csvFile.close()

chapter5/5-storeWikiLinks.py

@@ -1,5 +1,6 @@
 from urllib.request import urlopen
 from bs4 import BeautifulSoup
+import re
 import datetime
 import random
 import pymysql
@@ -30,4 +31,4 @@ def getLinks(articleUrl):
          links = getLinks(newArticle)
 finally:
     cur.close()
-    conn.close()
+    conn.close()