Address review: remove xmltestdata/ dir

python · Jan 23, 2024 · 4f8eaaa · 4f8eaaa
1 parent 13fdbc7
commit 4f8eaaa
Show file tree

Hide file tree

Showing 69 changed files with 12 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -29,7 +29,7 @@ Lib/test/decimaltestdata/*.decTest         noeol
 Lib/test/test_email/data/*.txt             noeol
 Lib/test/test_importlib/resources/data01/*           noeol
 Lib/test/test_importlib/resources/namespacedata01/*  noeol
-Lib/test/test_xml/xmltestdata/*                     noeol
+Lib/test/test_xml/*.xml                     noeol
 
 # Shell scripts should have LF even on Windows because of Cygwin
 Lib/venv/scripts/common/activate text eol=lf

diff --git a/Doc/license.rst b/Doc/license.rst
@@ -1009,7 +1009,7 @@ W3C C14N test suite
 -------------------
 
 The C14N 2.0 test suite in the :mod:`test` package
-(``Lib/test/test_xml/xmltestdata/c14n-20/``) was retrieved from the W3C website at
+(``Lib/test/test_xml/c14n-20/``) was retrieved from the W3C website at
 https://www.w3.org/TR/xml-c14n2-testcases/ and is distributed under the
 3-clause BSD license::
 

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -613,8 +613,6 @@ def findfile(filename, subdir=None):
     if os.path.isabs(filename):
         return filename
     if subdir is not None:
-        if not isinstance(subdir, str):
-            subdir = os.path.join(*subdir)
         filename = os.path.join(subdir, filename)
     path = [TEST_HOME_DIR] + sys.path
     for dn in path:

diff --git a/Lib/test/test_xml/xmltestdata/c14n-20/README → Lib/test/test_xml/c14n-20/README b/Lib/test/test_xml/xmltestdata/c14n-20/README → Lib/test/test_xml/c14n-20/README
diff --git a/...t_xml/xmltestdata/c14n-20/c14nComment.xml → Lib/test/test_xml/c14n-20/c14nComment.xml b/...t_xml/xmltestdata/c14n-20/c14nComment.xml → Lib/test/test_xml/c14n-20/c14nComment.xml
diff --git a/...t_xml/xmltestdata/c14n-20/c14nDefault.xml → Lib/test/test_xml/c14n-20/c14nDefault.xml b/...t_xml/xmltestdata/c14n-20/c14nDefault.xml → Lib/test/test_xml/c14n-20/c14nDefault.xml
diff --git a/...st_xml/xmltestdata/c14n-20/c14nPrefix.xml → Lib/test/test_xml/c14n-20/c14nPrefix.xml b/...st_xml/xmltestdata/c14n-20/c14nPrefix.xml → Lib/test/test_xml/c14n-20/c14nPrefix.xml
diff --git a/...l/xmltestdata/c14n-20/c14nPrefixQname.xml → ...test/test_xml/c14n-20/c14nPrefixQname.xml b/...l/xmltestdata/c14n-20/c14nPrefixQname.xml → ...test/test_xml/c14n-20/c14nPrefixQname.xml
diff --git a/...data/c14n-20/c14nPrefixQnameXpathElem.xml → ..._xml/c14n-20/c14nPrefixQnameXpathElem.xml b/...data/c14n-20/c14nPrefixQnameXpathElem.xml → ..._xml/c14n-20/c14nPrefixQnameXpathElem.xml
diff --git a/...est_xml/xmltestdata/c14n-20/c14nQname.xml → Lib/test/test_xml/c14n-20/c14nQname.xml b/...est_xml/xmltestdata/c14n-20/c14nQname.xml → Lib/test/test_xml/c14n-20/c14nQname.xml
diff --git a/...xml/xmltestdata/c14n-20/c14nQnameElem.xml → Lib/test/test_xml/c14n-20/c14nQnameElem.xml b/...xml/xmltestdata/c14n-20/c14nQnameElem.xml → Lib/test/test_xml/c14n-20/c14nQnameElem.xml
diff --git a/...mltestdata/c14n-20/c14nQnameXpathElem.xml → ...t/test_xml/c14n-20/c14nQnameXpathElem.xml b/...mltestdata/c14n-20/c14nQnameXpathElem.xml → ...t/test_xml/c14n-20/c14nQnameXpathElem.xml
diff --git a/...test_xml/xmltestdata/c14n-20/c14nTrim.xml → Lib/test/test_xml/c14n-20/c14nTrim.xml b/...test_xml/xmltestdata/c14n-20/c14nTrim.xml → Lib/test/test_xml/c14n-20/c14nTrim.xml
diff --git a/...test/test_xml/xmltestdata/c14n-20/doc.dtd → Lib/test/test_xml/c14n-20/doc.dtd b/...test/test_xml/xmltestdata/c14n-20/doc.dtd → Lib/test/test_xml/c14n-20/doc.dtd
diff --git a/...test/test_xml/xmltestdata/c14n-20/doc.xsl → Lib/test/test_xml/c14n-20/doc.xsl b/...test/test_xml/xmltestdata/c14n-20/doc.xsl → Lib/test/test_xml/c14n-20/doc.xsl
diff --git a/.../test_xml/xmltestdata/c14n-20/inC14N1.xml → Lib/test/test_xml/c14n-20/inC14N1.xml b/.../test_xml/xmltestdata/c14n-20/inC14N1.xml → Lib/test/test_xml/c14n-20/inC14N1.xml
diff --git a/.../test_xml/xmltestdata/c14n-20/inC14N2.xml → Lib/test/test_xml/c14n-20/inC14N2.xml b/.../test_xml/xmltestdata/c14n-20/inC14N2.xml → Lib/test/test_xml/c14n-20/inC14N2.xml
diff --git a/.../test_xml/xmltestdata/c14n-20/inC14N3.xml → Lib/test/test_xml/c14n-20/inC14N3.xml b/.../test_xml/xmltestdata/c14n-20/inC14N3.xml → Lib/test/test_xml/c14n-20/inC14N3.xml
diff --git a/.../test_xml/xmltestdata/c14n-20/inC14N4.xml → Lib/test/test_xml/c14n-20/inC14N4.xml b/.../test_xml/xmltestdata/c14n-20/inC14N4.xml → Lib/test/test_xml/c14n-20/inC14N4.xml
diff --git a/.../test_xml/xmltestdata/c14n-20/inC14N5.xml → Lib/test/test_xml/c14n-20/inC14N5.xml b/.../test_xml/xmltestdata/c14n-20/inC14N5.xml → Lib/test/test_xml/c14n-20/inC14N5.xml
diff --git a/.../test_xml/xmltestdata/c14n-20/inC14N6.xml → Lib/test/test_xml/c14n-20/inC14N6.xml b/.../test_xml/xmltestdata/c14n-20/inC14N6.xml → Lib/test/test_xml/c14n-20/inC14N6.xml
diff --git a/...t_xml/xmltestdata/c14n-20/inNsContent.xml → Lib/test/test_xml/c14n-20/inNsContent.xml b/...t_xml/xmltestdata/c14n-20/inNsContent.xml → Lib/test/test_xml/c14n-20/inNsContent.xml
diff --git a/...t_xml/xmltestdata/c14n-20/inNsDefault.xml → Lib/test/test_xml/c14n-20/inNsDefault.xml b/...t_xml/xmltestdata/c14n-20/inNsDefault.xml → Lib/test/test_xml/c14n-20/inNsDefault.xml
diff --git a/..._xml/xmltestdata/c14n-20/inNsPushdown.xml → Lib/test/test_xml/c14n-20/inNsPushdown.xml b/..._xml/xmltestdata/c14n-20/inNsPushdown.xml → Lib/test/test_xml/c14n-20/inNsPushdown.xml
diff --git a/...st_xml/xmltestdata/c14n-20/inNsRedecl.xml → Lib/test/test_xml/c14n-20/inNsRedecl.xml b/...st_xml/xmltestdata/c14n-20/inNsRedecl.xml → Lib/test/test_xml/c14n-20/inNsRedecl.xml
diff --git a/...test_xml/xmltestdata/c14n-20/inNsSort.xml → Lib/test/test_xml/c14n-20/inNsSort.xml b/...test_xml/xmltestdata/c14n-20/inNsSort.xml → Lib/test/test_xml/c14n-20/inNsSort.xml
diff --git a/...l/xmltestdata/c14n-20/inNsSuperfluous.xml → ...test/test_xml/c14n-20/inNsSuperfluous.xml b/...l/xmltestdata/c14n-20/inNsSuperfluous.xml → ...test/test_xml/c14n-20/inNsSuperfluous.xml
diff --git a/.../test_xml/xmltestdata/c14n-20/inNsXml.xml → Lib/test/test_xml/c14n-20/inNsXml.xml b/.../test_xml/xmltestdata/c14n-20/inNsXml.xml → Lib/test/test_xml/c14n-20/inNsXml.xml
diff --git a/...tdata/c14n-20/out_inC14N1_c14nComment.xml → ...t_xml/c14n-20/out_inC14N1_c14nComment.xml b/...tdata/c14n-20/out_inC14N1_c14nComment.xml → ...t_xml/c14n-20/out_inC14N1_c14nComment.xml
diff --git a/...tdata/c14n-20/out_inC14N1_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N1_c14nDefault.xml b/...tdata/c14n-20/out_inC14N1_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N1_c14nDefault.xml
diff --git a/...tdata/c14n-20/out_inC14N2_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N2_c14nDefault.xml b/...tdata/c14n-20/out_inC14N2_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N2_c14nDefault.xml
diff --git a/...testdata/c14n-20/out_inC14N2_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N2_c14nTrim.xml b/...testdata/c14n-20/out_inC14N2_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N2_c14nTrim.xml
diff --git a/...tdata/c14n-20/out_inC14N3_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N3_c14nDefault.xml b/...tdata/c14n-20/out_inC14N3_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N3_c14nDefault.xml
diff --git a/...stdata/c14n-20/out_inC14N3_c14nPrefix.xml → ...st_xml/c14n-20/out_inC14N3_c14nPrefix.xml b/...stdata/c14n-20/out_inC14N3_c14nPrefix.xml → ...st_xml/c14n-20/out_inC14N3_c14nPrefix.xml
diff --git a/...testdata/c14n-20/out_inC14N3_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N3_c14nTrim.xml b/...testdata/c14n-20/out_inC14N3_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N3_c14nTrim.xml
diff --git a/...tdata/c14n-20/out_inC14N4_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N4_c14nDefault.xml b/...tdata/c14n-20/out_inC14N4_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N4_c14nDefault.xml
diff --git a/...testdata/c14n-20/out_inC14N4_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N4_c14nTrim.xml b/...testdata/c14n-20/out_inC14N4_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N4_c14nTrim.xml
diff --git a/...tdata/c14n-20/out_inC14N5_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N5_c14nDefault.xml b/...tdata/c14n-20/out_inC14N5_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N5_c14nDefault.xml
diff --git a/...testdata/c14n-20/out_inC14N5_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N5_c14nTrim.xml b/...testdata/c14n-20/out_inC14N5_c14nTrim.xml → ...test_xml/c14n-20/out_inC14N5_c14nTrim.xml
diff --git a/...tdata/c14n-20/out_inC14N6_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N6_c14nDefault.xml b/...tdata/c14n-20/out_inC14N6_c14nDefault.xml → ...t_xml/c14n-20/out_inC14N6_c14nDefault.xml
diff --git a/...a/c14n-20/out_inNsContent_c14nDefault.xml → ...l/c14n-20/out_inNsContent_c14nDefault.xml b/...a/c14n-20/out_inNsContent_c14nDefault.xml → ...l/c14n-20/out_inNsContent_c14nDefault.xml
diff --git a/..._inNsContent_c14nPrefixQnameXpathElem.xml → ..._inNsContent_c14nPrefixQnameXpathElem.xml b/..._inNsContent_c14nPrefixQnameXpathElem.xml → ..._inNsContent_c14nPrefixQnameXpathElem.xml
diff --git a/...c14n-20/out_inNsContent_c14nQnameElem.xml → ...c14n-20/out_inNsContent_c14nQnameElem.xml b/...c14n-20/out_inNsContent_c14nQnameElem.xml → ...c14n-20/out_inNsContent_c14nQnameElem.xml
diff --git a/...20/out_inNsContent_c14nQnameXpathElem.xml → ...20/out_inNsContent_c14nQnameXpathElem.xml b/...20/out_inNsContent_c14nQnameXpathElem.xml → ...20/out_inNsContent_c14nQnameXpathElem.xml
diff --git a/...a/c14n-20/out_inNsDefault_c14nDefault.xml → ...l/c14n-20/out_inNsDefault_c14nDefault.xml b/...a/c14n-20/out_inNsDefault_c14nDefault.xml → ...l/c14n-20/out_inNsDefault_c14nDefault.xml
diff --git a/...ta/c14n-20/out_inNsDefault_c14nPrefix.xml → ...ml/c14n-20/out_inNsDefault_c14nPrefix.xml b/...ta/c14n-20/out_inNsDefault_c14nPrefix.xml → ...ml/c14n-20/out_inNsDefault_c14nPrefix.xml
diff --git a/.../c14n-20/out_inNsPushdown_c14nDefault.xml → .../c14n-20/out_inNsPushdown_c14nDefault.xml b/.../c14n-20/out_inNsPushdown_c14nDefault.xml → .../c14n-20/out_inNsPushdown_c14nDefault.xml
diff --git a/...a/c14n-20/out_inNsPushdown_c14nPrefix.xml → ...l/c14n-20/out_inNsPushdown_c14nPrefix.xml b/...a/c14n-20/out_inNsPushdown_c14nPrefix.xml → ...l/c14n-20/out_inNsPushdown_c14nPrefix.xml
diff --git a/...ta/c14n-20/out_inNsRedecl_c14nDefault.xml → ...ml/c14n-20/out_inNsRedecl_c14nDefault.xml b/...ta/c14n-20/out_inNsRedecl_c14nDefault.xml → ...ml/c14n-20/out_inNsRedecl_c14nDefault.xml
diff --git a/...ata/c14n-20/out_inNsRedecl_c14nPrefix.xml → ...xml/c14n-20/out_inNsRedecl_c14nPrefix.xml b/...ata/c14n-20/out_inNsRedecl_c14nPrefix.xml → ...xml/c14n-20/out_inNsRedecl_c14nPrefix.xml
diff --git a/...data/c14n-20/out_inNsSort_c14nDefault.xml → ..._xml/c14n-20/out_inNsSort_c14nDefault.xml b/...data/c14n-20/out_inNsSort_c14nDefault.xml → ..._xml/c14n-20/out_inNsSort_c14nDefault.xml
diff --git a/...tdata/c14n-20/out_inNsSort_c14nPrefix.xml → ...t_xml/c14n-20/out_inNsSort_c14nPrefix.xml b/...tdata/c14n-20/out_inNsSort_c14nPrefix.xml → ...t_xml/c14n-20/out_inNsSort_c14nPrefix.xml
diff --git a/...4n-20/out_inNsSuperfluous_c14nDefault.xml → ...4n-20/out_inNsSuperfluous_c14nDefault.xml b/...4n-20/out_inNsSuperfluous_c14nDefault.xml → ...4n-20/out_inNsSuperfluous_c14nDefault.xml
diff --git a/...14n-20/out_inNsSuperfluous_c14nPrefix.xml → ...14n-20/out_inNsSuperfluous_c14nPrefix.xml b/...14n-20/out_inNsSuperfluous_c14nPrefix.xml → ...14n-20/out_inNsSuperfluous_c14nPrefix.xml
diff --git a/...tdata/c14n-20/out_inNsXml_c14nDefault.xml → ...t_xml/c14n-20/out_inNsXml_c14nDefault.xml b/...tdata/c14n-20/out_inNsXml_c14nDefault.xml → ...t_xml/c14n-20/out_inNsXml_c14nDefault.xml
diff --git a/...stdata/c14n-20/out_inNsXml_c14nPrefix.xml → ...st_xml/c14n-20/out_inNsXml_c14nPrefix.xml b/...stdata/c14n-20/out_inNsXml_c14nPrefix.xml → ...st_xml/c14n-20/out_inNsXml_c14nPrefix.xml
diff --git a/...a/c14n-20/out_inNsXml_c14nPrefixQname.xml → ...l/c14n-20/out_inNsXml_c14nPrefixQname.xml b/...a/c14n-20/out_inNsXml_c14nPrefixQname.xml → ...l/c14n-20/out_inNsXml_c14nPrefixQname.xml
diff --git a/...estdata/c14n-20/out_inNsXml_c14nQname.xml → ...est_xml/c14n-20/out_inNsXml_c14nQname.xml b/...estdata/c14n-20/out_inNsXml_c14nQname.xml → ...est_xml/c14n-20/out_inNsXml_c14nQname.xml
diff --git a/...st/test_xml/xmltestdata/c14n-20/world.txt → Lib/test/test_xml/c14n-20/world.txt b/...st/test_xml/xmltestdata/c14n-20/world.txt → Lib/test/test_xml/c14n-20/world.txt
diff --git a/...est_xml/xmltestdata/expat224_utf8_bug.xml → Lib/test/test_xml/expat224_utf8_bug.xml b/...est_xml/xmltestdata/expat224_utf8_bug.xml → Lib/test/test_xml/expat224_utf8_bug.xml
diff --git a/Lib/test/test_xml/xmltestdata/simple-ns.xml → Lib/test/test_xml/simple-ns.xml b/Lib/test/test_xml/xmltestdata/simple-ns.xml → Lib/test/test_xml/simple-ns.xml
diff --git a/Lib/test/test_xml/xmltestdata/simple.xml → Lib/test/test_xml/simple.xml b/Lib/test/test_xml/xmltestdata/simple.xml → Lib/test/test_xml/simple.xml
diff --git a/Lib/test/test_xml/xmltestdata/test.xml → Lib/test/test_xml/test.xml b/Lib/test/test_xml/xmltestdata/test.xml → Lib/test/test_xml/test.xml
diff --git a/Lib/test/test_xml/xmltestdata/test.xml.out → Lib/test/test_xml/test.xml.out b/Lib/test/test_xml/xmltestdata/test.xml.out → Lib/test/test_xml/test.xml.out
diff --git a/Lib/test/test_xml/test_minidom.py b/Lib/test/test_xml/test_minidom.py
@@ -13,7 +13,7 @@
 from xml.parsers.expat import ExpatError
 
 
-tstfile = support.findfile("test.xml", subdir=("test_xml", "xmltestdata"))
+tstfile = support.findfile("test.xml", subdir="test_xml")
 sample = ("<?xml version='1.0' encoding='us-ascii'?>\n"
           "<!DOCTYPE doc PUBLIC 'http://xml.python.org/public'"
           " 'http://xml.python.org/system' [\n"

diff --git a/Lib/test/test_xml/test_pulldom.py b/Lib/test/test_xml/test_pulldom.py
@@ -9,7 +9,7 @@
 from test.support import findfile
 
 
-tstfile = findfile("test.xml", subdir=("test_xml", "xmltestdata"))
+tstfile = findfile("test.xml", subdir="test_xml")
 
 # A handy XML snippet, containing attributes, a namespace prefix, and a
 # self-closing tag:

diff --git a/Lib/test/test_xml/test_sax.py b/Lib/test/test_xml/test_sax.py
@@ -28,8 +28,8 @@
 from test.support.os_helper import FakePath, TESTFN
 
 
-TEST_XMLFILE = findfile("test.xml", subdir=("test_xml", "xmltestdata"))
-TEST_XMLFILE_OUT = findfile("test.xml.out", subdir=("test_xml", "xmltestdata"))
+TEST_XMLFILE = findfile("test.xml", subdir="test_xml")
+TEST_XMLFILE_OUT = findfile("test.xml.out", subdir="test_xml")
 try:
     TEST_XMLFILE.encode("utf-8")
     TEST_XMLFILE_OUT.encode("utf-8")

diff --git a/Lib/test/test_xml/test_xml_etree.py b/Lib/test/test_xml/test_xml_etree.py
@@ -37,13 +37,13 @@
 pyET = None
 ET = None
 
-SIMPLE_XMLFILE = findfile("simple.xml", subdir=("test_xml", "xmltestdata"))
+SIMPLE_XMLFILE = findfile("simple.xml", subdir="test_xml")
 try:
     SIMPLE_XMLFILE.encode("utf-8")
 except UnicodeEncodeError:
     raise unittest.SkipTest("filename is not encodable to utf8")
-SIMPLE_NS_XMLFILE = findfile("simple-ns.xml", subdir=("test_xml", "xmltestdata"))
-UTF8_BUG_XMLFILE = findfile("expat224_utf8_bug.xml", subdir=("test_xml", "xmltestdata"))
+SIMPLE_NS_XMLFILE = findfile("simple-ns.xml", subdir="test_xml")
+UTF8_BUG_XMLFILE = findfile("expat224_utf8_bug.xml", subdir="test_xml")
 
 SAMPLE_XML = """\
 <body>
@@ -4088,13 +4088,13 @@ def test_c14n_exclusion(self):
 
     #
     # basic method=c14n tests from the c14n 2.0 specification.  uses
-    # test files under xmltestdata/c14n-20.
+    # test files under test_xml/c14n-20.
 
     # note that this uses generated C14N versions of the standard ET.write
     # output, not roundtripped C14N (see above).
 
     def test_xml_c14n2(self):
-        datadir = findfile("c14n-20", subdir=("test_xml", "xmltestdata"))
+        datadir = findfile("c14n-20", subdir="test_xml")
         full_path = partial(os.path.join, datadir)
 
         files = [filename[:-4] for filename in sorted(os.listdir(datadir))

diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2318,8 +2318,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/tracedmodules \
 		test/typinganndata \
 		test/test_xml \
-		test/test_xml/xmltestdata \
-		test/test_xml/xmltestdata/c14n-20
+		test/test_xml/c14n-20
 
 COMPILEALL_OPTS=-j0