Switched continue statements not in the loop to pass statements which were a result of switching the body of the program to a function.

theanti9 · theanti9 · commit 19127863a712 · 2010-04-22T00:02:33.000-04:00
diff --git a/PyCrawler.py b/PyCrawler.py
@@ -26,18 +26,18 @@
 class threader ( threading.Thread ):
 	def run(self):
 		while 1:
-			crawl()
+			try:
+				cursor.execute("SELECT * FROM queue LIMIT 1")
+				crawling = cursor.fetchone()
+				crawling = crawling[0]
+				cursor.execute("DELETE FROM queue WHERE url = (?)", (crawling, ))
+				connection.commit()
+				print crawling
+			except KeyError:
+				raise StopIteration
+			self.crawl(crawling)
 			
-	def crawl():
-		try:
-			cursor.execute("SELECT * FROM queue LIMIT 1")
-			crawling = cursor.fetchone()
-			crawling = crawling[0]
-			cursor.execute("DELETE FROM queue WHERE url = (?)", (crawling, ))
-			connection.commit()
-			print crawling
-		except KeyError:
-			raise StopIteration
+	def crawl(self, crawling):
 		url = urlparse.urlparse(crawling)
 		try:
 			crawled.append(crawling)
@@ -46,7 +46,7 @@ def crawl():
 		try:
 			response = urllib2.urlopen(crawling)
 		except:
-			continue
+			return
 		msg = response.read()
 		startPos = msg.find('<title>')
 		if startPos != -1:
@@ -79,6 +79,6 @@ def crawl():
 			cursor.execute("INSERT INTO crawl_index VALUES( (?), (?), (?) )", (crawling, title, keywordlist))
 			connection.commit()
 		except:
-			continue
+			pass
 if __name__ == '__main__':
 	threader().run()

-Original file line number
+Diff line change
 classthreader ( threading.Thread ):
 defrun(self):
 while1:
 -crawl()
 +try:
 +cursor.execute("SELECT * FROM queue LIMIT 1")
 +crawling=cursor.fetchone()
 +crawling=crawling[0]
 +cursor.execute("DELETE FROM queue WHERE url = (?)", (crawling, ))
 +connection.commit()
 +printcrawling
 +exceptKeyError:
 +raiseStopIteration
 +self.crawl(crawling)
 -defcrawl():
 -try:
 -cursor.execute("SELECT * FROM queue LIMIT 1")
 -crawling=cursor.fetchone()
 -crawling=crawling[0]
 -cursor.execute("DELETE FROM queue WHERE url = (?)", (crawling, ))
 -connection.commit()
 -printcrawling
 -exceptKeyError:
 -raiseStopIteration
 +defcrawl(self, crawling):
 url=urlparse.urlparse(crawling)
 try:
 crawled.append(crawling)
 try:
 response=urllib2.urlopen(crawling)
 except:
 -continue
 +return
 msg=response.read()
 startPos=msg.find('<title>')
 ifstartPos!=-1:
 cursor.execute("INSERT INTO crawl_index VALUES( (?), (?), (?) )", (crawling, title, keywordlist))
 connection.commit()
 except:
 -continue
 +pass
 if__name__=='__main__':
 threader().run()