Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from · python/cpython@f15351d (original) (raw)
`@@ -15,7 +15,9 @@
`
15
15
`from io import StringIO
`
16
16
`from test.support import findfile, run_unittest
`
17
17
`import unittest
`
18
``
`-
import os
`
``
18
+
``
19
`+
TEST_XMLFILE = findfile("test.xml", subdir="xmltestdata")
`
``
20
`+
TEST_XMLFILE_OUT = findfile("test.xml.out", subdir="xmltestdata")
`
19
21
``
20
22
`ns_uri = "http://www.python.org/xml-ns/saxtest/"
`
21
23
``
`@@ -311,7 +313,7 @@ def test_filter_basic(self):
`
311
313
`#
`
312
314
`# ===========================================================================
`
313
315
``
314
``
`-
xml_test_out = open(findfile("test.xml.out")).read()
`
``
316
`+
xml_test_out = open(TEST_XMLFILE_OUT).read()
`
315
317
``
316
318
`class ExpatReaderTest(XmlTestBase):
`
317
319
``
`@@ -323,7 +325,7 @@ def test_expat_file(self):
`
323
325
`xmlgen = XMLGenerator(result)
`
324
326
``
325
327
`parser.setContentHandler(xmlgen)
`
326
``
`-
parser.parse(open(findfile("test.xml")))
`
``
328
`+
parser.parse(open(TEST_XMLFILE))
`
327
329
``
328
330
`self.assertEquals(result.getvalue(), xml_test_out)
`
329
331
``
`@@ -452,7 +454,7 @@ def test_expat_inpsource_filename(self):
`
452
454
`xmlgen = XMLGenerator(result)
`
453
455
``
454
456
`parser.setContentHandler(xmlgen)
`
455
``
`-
parser.parse(findfile("test.xml"))
`
``
457
`+
parser.parse(TEST_XMLFILE)
`
456
458
``
457
459
`self.assertEquals(result.getvalue(), xml_test_out)
`
458
460
``
`@@ -462,7 +464,7 @@ def test_expat_inpsource_sysid(self):
`
462
464
`xmlgen = XMLGenerator(result)
`
463
465
``
464
466
`parser.setContentHandler(xmlgen)
`
465
``
`-
parser.parse(InputSource(findfile("test.xml")))
`
``
467
`+
parser.parse(InputSource(TEST_XMLFILE))
`
466
468
``
467
469
`self.assertEquals(result.getvalue(), xml_test_out)
`
468
470
``
`@@ -473,7 +475,7 @@ def test_expat_inpsource_stream(self):
`
473
475
``
474
476
`parser.setContentHandler(xmlgen)
`
475
477
`inpsrc = InputSource()
`
476
``
`-
inpsrc.setByteStream(open(findfile("test.xml")))
`
``
478
`+
inpsrc.setByteStream(open(TEST_XMLFILE))
`
477
479
`parser.parse(inpsrc)
`
478
480
``
479
481
`self.assertEquals(result.getvalue(), xml_test_out)
`
`@@ -534,9 +536,9 @@ def test_expat_locator_withinfo(self):
`
534
536
`xmlgen = XMLGenerator(result)
`
535
537
`parser = create_parser()
`
536
538
`parser.setContentHandler(xmlgen)
`
537
``
`-
parser.parse(findfile("test.xml"))
`
``
539
`+
parser.parse(TEST_XMLFILE)
`
538
540
``
539
``
`-
self.assertEquals(parser.getSystemId(), findfile("test.xml"))
`
``
541
`+
self.assertEquals(parser.getSystemId(), TEST_XMLFILE)
`
540
542
`self.assertEquals(parser.getPublicId(), None)
`
541
543
``
542
544
``