*** /var/folders/5q/5qTPn6xq2RaWqk+1Ytw3-U+++TI/-Tmp-/ediffkRAGdt Tue Jun 17 19:21:39 2008 --- /Users/skip/src/python/trunk/Lib/robotparser.py Tue Jun 17 19:21:24 2008 *************** *** 55,65 **** """Reads the robots.txt URL and feeds it to the parser.""" opener = URLopener() f = opener.open(self.url) ! lines = [] ! line = f.readline() ! while line: ! lines.append(line.strip()) ! line = f.readline() self.errcode = opener.errcode if self.errcode in (401, 403): self.disallow_all = True --- 55,62 ---- """Reads the robots.txt URL and feeds it to the parser.""" opener = URLopener() f = opener.open(self.url) ! lines = [line.strip() for line in f] ! f.close() self.errcode = opener.errcode if self.errcode in (401, 403): self.disallow_all = True *************** *** 84,90 **** entry = Entry() for line in lines: ! linenumber = linenumber + 1 if not line: if state == 1: entry = Entry() --- 81,87 ---- entry = Entry() for line in lines: ! linenumber += 1 if not line: if state == 1: entry = Entry()