#1778443 robotparser fixes from Aristotelis Mikropoulos

diff --git a/Lib/robotparser.py b/Lib/robotparser.py
index 5b1d797fe86ea682e7a59586a026e7210d7c1b40..f249187e2c5ab0ed4e92147a00c4214a3b5a1b05 100644 (file)
--- a/Lib/robotparser.py
+++ b/Lib/robotparser.py
@@ -55,11 +55,8 @@ class RobotFileParser:
         """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()
+        lines = [line.strip() for line in f]
+        f.close()
         self.errcode = opener.errcode
         if self.errcode in (401, 403):
             self.disallow_all = True
@@ -84,7 +81,7 @@ class RobotFileParser:
         entry = Entry()
 
         for line in lines:
-            linenumber = linenumber + 1
+            linenumber += 1
             if not line:
                 if state == 1:
                     entry = Entry()

diff --git a/Misc/ACKS b/Misc/ACKS
index e79f20a237d952a72ab1b1685abe7cd9b0dc6316..ac445ae81556cb8d136917ebd43f13d110561863 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -460,6 +460,7 @@ Luke Mewburn
 Mike Meyer
 Steven Miale
 Trent Mick
+Aristotelis Mikropoulos
 Damien Miller
 Chad Miller
 Jay T. Miller