changeset:   93627:27ae1a476ef7
branch:      3.4
parent:      93625:89bb4384f1e1
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Thu Nov 27 22:13:16 2014 +0200
files:       Lib/test/test_sax.py Lib/xml/sax/saxutils.py Misc/NEWS
description:
Issue #22915: SAX parser now supports files opened with file descriptor or
bytes path.


diff -r 89bb4384f1e1 -r 27ae1a476ef7 Lib/test/test_sax.py
--- a/Lib/test/test_sax.py	Thu Nov 27 19:41:47 2014 +0200
+++ b/Lib/test/test_sax.py	Thu Nov 27 22:13:16 2014 +0200
@@ -648,6 +648,30 @@
 
         self.assertEqual(result.getvalue(), xml_test_out)
 
+    def test_expat_binary_file_bytes_name(self):
+        fname = os.fsencode(TEST_XMLFILE)
+        parser = create_parser()
+        result = BytesIO()
+        xmlgen = XMLGenerator(result)
+
+        parser.setContentHandler(xmlgen)
+        with open(fname, 'rb') as f:
+            parser.parse(f)
+
+        self.assertEqual(result.getvalue(), xml_test_out)
+
+    def test_expat_binary_file_int_name(self):
+        parser = create_parser()
+        result = BytesIO()
+        xmlgen = XMLGenerator(result)
+
+        parser.setContentHandler(xmlgen)
+        with open(TEST_XMLFILE, 'rb') as f:
+            with open(f.fileno(), 'rb', closefd=False) as f2:
+                parser.parse(f2)
+
+        self.assertEqual(result.getvalue(), xml_test_out)
+
     # ===== DTDHandler support
 
     class TestDTDHandler:
diff -r 89bb4384f1e1 -r 27ae1a476ef7 Lib/xml/sax/saxutils.py
--- a/Lib/xml/sax/saxutils.py	Thu Nov 27 19:41:47 2014 +0200
+++ b/Lib/xml/sax/saxutils.py	Thu Nov 27 22:13:16 2014 +0200
@@ -346,7 +346,7 @@
         f = source
         source = xmlreader.InputSource()
         source.setByteStream(f)
-        if hasattr(f, "name"):
+        if hasattr(f, "name") and isinstance(f.name, str):
             source.setSystemId(f.name)
 
     if source.getByteStream() is None:
diff -r 89bb4384f1e1 -r 27ae1a476ef7 Misc/NEWS
--- a/Misc/NEWS	Thu Nov 27 19:41:47 2014 +0200
+++ b/Misc/NEWS	Thu Nov 27 22:13:16 2014 +0200
@@ -36,6 +36,9 @@
 Library
 -------
 
+- Issue #22915: SAX parser now supports files opened with file descriptor or
+  bytes path.
+
 - Issue #22609: Constructors and update methods of mapping classes in the
   collections module now accept the self keyword argument.