From: Georg Brandl <georg@python.org>
Date: Mon, 21 Jan 2008 17:22:06 +0000 (+0000)
Subject: #1726198: replace while 1: fp.readline() with file iteration.
X-Git-Tag: v2.6a1~481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ea8cb49ed728dadec11d0a554431c566fdc5a56;p=thirdparty%2FPython%2Fcpython.git

#1726198: replace while 1: fp.readline() with file iteration.
---

diff --git a/Lib/formatter.py b/Lib/formatter.py
index fa2b38938ae6..834b5601d30a 100644
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -432,10 +432,7 @@ def test(file = None):
         fp = open(sys.argv[1])
     else:
         fp = sys.stdin
-    while 1:
-        line = fp.readline()
-        if not line:
-            break
+    for line in fp:
         if line == '\n':
             f.end_paragraph(1)
         else:
diff --git a/Lib/keyword.py b/Lib/keyword.py
index cd1d55e8a2cf..8eb2860307e5 100755
--- a/Lib/keyword.py
+++ b/Lib/keyword.py
@@ -62,9 +62,7 @@ def main():
     fp = open(iptfile)
     strprog = re.compile('"([^"]+)"')
     lines = []
-    while 1:
-        line = fp.readline()
-        if not line: break
+    for line in fp:
         if '{1, "' in line:
             match = strprog.search(line)
             if match:
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index ada61429894b..631a5a1cb318 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -306,9 +306,7 @@ def test():
         except ImportError:
             from StringIO import StringIO
         fp = StringIO(test_input)
-    while 1:
-        line = fp.readline()
-        if not line: break
+    for line in fp:
         words = line.split()
         if not words:
             continue
diff --git a/Tools/pynche/ColorDB.py b/Tools/pynche/ColorDB.py
index 96b6ce67c85d..84a5b0702e00 100644
--- a/Tools/pynche/ColorDB.py
+++ b/Tools/pynche/ColorDB.py
@@ -50,10 +50,7 @@ class ColorDB:
         self.__byname = {}
         # all unique names (non-aliases).  built-on demand
         self.__allnames = None
-        while 1:
-            line = fp.readline()
-            if not line:
-                break
+        for line in fp:
             # get this compiled regular expression from derived class
             mo = self._re.match(line)
             if not mo: