#2501 xml.sax.parser doesn't terminate when given a filename; enable some more tests!

benjaminp · benjaminp · commit a7f4f5a77216 · 2008-09-04T02:22:52.000Z
Reviewed by myself
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
@@ -446,8 +446,7 @@ def test_expat_nsattrs_wattr(self):
 
     # ===== InputSource support
 
-    def XXXtest_expat_inpsource_filename(self):
-        # FIXME: test blocks indefinitely
+    def test_expat_inpsource_filename(self):
         parser = create_parser()
         result = StringIO()
         xmlgen = XMLGenerator(result)
@@ -457,8 +456,7 @@ def XXXtest_expat_inpsource_filename(self):
 
         self.assertEquals(result.getvalue(), xml_test_out)
 
-    def XXXtest_expat_inpsource_sysid(self):
-        # FIXME: test blocks indefinitely
+    def test_expat_inpsource_sysid(self):
         parser = create_parser()
         result = StringIO()
         xmlgen = XMLGenerator(result)
@@ -531,8 +529,7 @@ def test_expat_locator_noinfo(self):
         self.assertEquals(parser.getPublicId(), None)
         self.assertEquals(parser.getLineNumber(), 1)
 
-    def XXXtest_expat_locator_withinfo(self):
-        # FIXME: test blocks indefinitely
+    def test_expat_locator_withinfo(self):
         result = StringIO()
         xmlgen = XMLGenerator(result)
         parser = create_parser()
diff --git a/Lib/xml/sax/xmlreader.py b/Lib/xml/sax/xmlreader.py
@@ -119,7 +119,7 @@ def parse(self, source):
         self.prepareParser(source)
         file = source.getByteStream()
         buffer = file.read(self._bufsize)
-        while buffer != "":
+        while buffer:
             self.feed(buffer)
             buffer = file.read(self._bufsize)
         self.close()
