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

Author: Ryan Mitchell

chapter4/3-getTwitterStatus.py

@@ -1,6 +1,6 @@
-from twitter import Twitter
+from twitter import Twitter, OAuth
 
 #Make sure to add the access tokens and consumer keys for your application
 t = Twitter(auth=OAuth("Access Token","Access Token Secret","Consumer Key","Consumer Secret"))
 pythonStatuses = t.statuses.user_timeline(screen_name="montypython", count=5)
-print(pythonStatuses)
+print(pythonStatuses)

chapter5/8-sendEmailWhenChristmas.py

@@ -10,13 +10,13 @@ def sendMail(subject, body):
     msg['From'] = "[email protected]"
     msg['To'] = "[email protected]"
 
-s = smtplib.SMTP('localhost')
-s.send_message(msg)
-s.quit()
+	s = smtplib.SMTP('localhost')
+	s.send_message(msg)
+	s.quit()
 
 bsObj = BeautifulSoup(urlopen("https://isitchristmas.com/"))
 while(bsObj.find("a", {"id":"answer"}).attrs['title'] == "NO"):
     print("It is not Christmas yet.")
     time.sleep(3600)
-bsObj = BeautifulSoup(urlopen("https://isitchristmas.com/"))
-sendMail("It's Christmas!", "According to http://itischristmas.com, it is Christmas!")
+    bsObj = BeautifulSoup(urlopen("https://isitchristmas.com/"))
+sendMail("It's Christmas!", "According to http://itischristmas.com, it is Christmas!")

chapter8/7-NltkAnalysis.py

@@ -1,11 +1,10 @@
 from nltk import word_tokenize, sent_tokenize, pos_tag
-sentences = sent_tokenize("Google is one of the best companies in the world. 
-I constantly google myself to see what I'm up to.")
+sentences = sent_tokenize("Google is one of the best companies in the world. I constantly google myself to see what I'm up to.")
 nouns = ['NN', 'NNS', 'NNP', 'NNPS']
 
 for sentence in sentences: 
     if "google" in sentence.lower(): 
         taggedWords = pos_tag(word_tokenize(sentence)) 
             for word in taggedWords: 
                 if word[0].lower() == "google" and word[1] in nouns: 
-                    print(sentence)
+                    print(sentence)