From b88ea4a4991d3fd9b9c8300db075b749b247c6db Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Tue, 7 Jun 2022 20:03:52 +0100
Subject: [PATCH] Simplify `__all__` for `unittest` and `xml.etree` (#8029)

---
 stdlib/unittest/__init__.pyi     | 107 ++++++++---------------------
 stdlib/xml/etree/ElementTree.pyi | 112 +++++++++----------------------
 2 files changed, 58 insertions(+), 161 deletions(-)

diff --git a/stdlib/unittest/__init__.pyi b/stdlib/unittest/__init__.pyi
index 114c8aec5..673597275 100644
--- a/stdlib/unittest/__init__.pyi
+++ b/stdlib/unittest/__init__.pyi
@@ -35,85 +35,34 @@ if sys.version_info >= (3, 8):
 if sys.version_info >= (3, 11):
     from .case import doModuleCleanups as doModuleCleanups, enterModuleContext as enterModuleContext
 
+__all__ = [
+    "TestResult",
+    "TestCase",
+    "TestSuite",
+    "TextTestRunner",
+    "TestLoader",
+    "FunctionTestCase",
+    "main",
+    "defaultTestLoader",
+    "SkipTest",
+    "skip",
+    "skipIf",
+    "skipUnless",
+    "expectedFailure",
+    "TextTestResult",
+    "installHandler",
+    "registerResult",
+    "removeResult",
+    "removeHandler",
+    "getTestCaseNames",
+    "makeSuite",
+    "findTestCases",
+]
+
+if sys.version_info >= (3, 8):
+    __all__ += ["addModuleCleanup", "IsolatedAsyncioTestCase"]
+
 if sys.version_info >= (3, 11):
-    __all__ = [
-        "TestResult",
-        "TestCase",
-        "IsolatedAsyncioTestCase",
-        "TestSuite",
-        "TextTestRunner",
-        "TestLoader",
-        "FunctionTestCase",
-        "main",
-        "defaultTestLoader",
-        "SkipTest",
-        "skip",
-        "skipIf",
-        "skipUnless",
-        "expectedFailure",
-        "TextTestResult",
-        "installHandler",
-        "registerResult",
-        "removeResult",
-        "removeHandler",
-        "addModuleCleanup",
-        "doModuleCleanups",
-        "enterModuleContext",
-        "getTestCaseNames",
-        "makeSuite",
-        "findTestCases",
-    ]
-
-elif sys.version_info >= (3, 8):
-    __all__ = [
-        "TestResult",
-        "TestCase",
-        "IsolatedAsyncioTestCase",
-        "TestSuite",
-        "TextTestRunner",
-        "TestLoader",
-        "FunctionTestCase",
-        "main",
-        "defaultTestLoader",
-        "SkipTest",
-        "skip",
-        "skipIf",
-        "skipUnless",
-        "expectedFailure",
-        "TextTestResult",
-        "installHandler",
-        "registerResult",
-        "removeResult",
-        "removeHandler",
-        "addModuleCleanup",
-        "getTestCaseNames",
-        "makeSuite",
-        "findTestCases",
-    ]
-
-else:
-    __all__ = [
-        "TestResult",
-        "TestCase",
-        "TestSuite",
-        "TextTestRunner",
-        "TestLoader",
-        "FunctionTestCase",
-        "main",
-        "defaultTestLoader",
-        "SkipTest",
-        "skip",
-        "skipIf",
-        "skipUnless",
-        "expectedFailure",
-        "TextTestResult",
-        "installHandler",
-        "registerResult",
-        "removeResult",
-        "removeHandler",
-        "getTestCaseNames",
-        "makeSuite",
-        "findTestCases",
-    ]
+    __all__ += ["enterModuleContext", "doModuleCleanups"]
 
 def load_tests(loader: TestLoader, tests: TestSuite, pattern: str | None) -> TestSuite: ...
diff --git a/stdlib/xml/etree/ElementTree.pyi b/stdlib/xml/etree/ElementTree.pyi
index dacb6fffc..3c4bd553d 100644
--- a/stdlib/xml/etree/ElementTree.pyi
+++ b/stdlib/xml/etree/ElementTree.pyi
@@ -4,89 +4,37 @@ from collections.abc import Callable, Generator, ItemsView, Iterable, Iterator,
 from typing import Any, TypeVar, overload
 from typing_extensions import Literal, SupportsIndex, TypeAlias, TypeGuard
 
+__all__ = [
+    "Comment",
+    "dump",
+    "Element",
+    "ElementTree",
+    "fromstring",
+    "fromstringlist",
+    "iselement",
+    "iterparse",
+    "parse",
+    "ParseError",
+    "PI",
+    "ProcessingInstruction",
+    "QName",
+    "SubElement",
+    "tostring",
+    "tostringlist",
+    "TreeBuilder",
+    "VERSION",
+    "XML",
+    "XMLID",
+    "XMLParser",
+    "XMLPullParser",
+    "register_namespace",
+]
+
+if sys.version_info >= (3, 8):
+    __all__ += ["C14NWriterTarget", "canonicalize"]
+
 if sys.version_info >= (3, 9):
-    __all__ = [
-        "Comment",
-        "dump",
-        "Element",
-        "ElementTree",
-        "fromstring",
-        "fromstringlist",
-        "indent",
-        "iselement",
-        "iterparse",
-        "parse",
-        "ParseError",
-        "PI",
-        "ProcessingInstruction",
-        "QName",
-        "SubElement",
-        "tostring",
-        "tostringlist",
-        "TreeBuilder",
-        "VERSION",
-        "XML",
-        "XMLID",
-        "XMLParser",
-        "XMLPullParser",
-        "register_namespace",
-        "canonicalize",
-        "C14NWriterTarget",
-    ]
-elif sys.version_info >= (3, 8):
-    __all__ = [
-        "Comment",
-        "dump",
-        "Element",
-        "ElementTree",
-        "fromstring",
-        "fromstringlist",
-        "iselement",
-        "iterparse",
-        "parse",
-        "ParseError",
-        "PI",
-        "ProcessingInstruction",
-        "QName",
-        "SubElement",
-        "tostring",
-        "tostringlist",
-        "TreeBuilder",
-        "VERSION",
-        "XML",
-        "XMLID",
-        "XMLParser",
-        "XMLPullParser",
-        "register_namespace",
-        "canonicalize",
-        "C14NWriterTarget",
-    ]
-else:
-    __all__ = [
-        "Comment",
-        "dump",
-        "Element",
-        "ElementTree",
-        "fromstring",
-        "fromstringlist",
-        "iselement",
-        "iterparse",
-        "parse",
-        "ParseError",
-        "PI",
-        "ProcessingInstruction",
-        "QName",
-        "SubElement",
-        "tostring",
-        "tostringlist",
-        "TreeBuilder",
-        "VERSION",
-        "XML",
-        "XMLID",
-        "XMLParser",
-        "XMLPullParser",
-        "register_namespace",
-    ]
+    __all__ += ["indent"]
 
 _T = TypeVar("_T")
 _FileRead: TypeAlias = StrOrBytesPath | FileDescriptor | SupportsRead[bytes] | SupportsRead[str]