Merge for issue #22191 fix

3 files changed, 22 insertions, 1 deletions

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index cd3288b6b5..ad1d5407bc 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -61,6 +61,25 @@ class BaseTest:
         sys.modules['warnings'] = original_warnings
         super(BaseTest, self).tearDown()
 
+class PublicAPITests(BaseTest):
+
+    """Ensures that the correct values are exposed in the
+    public API.
+    """
+
+    def test_module_all_attribute(self):
+        self.assertTrue(hasattr(self.module, '__all__'))
+        target_api = ["warn", "warn_explicit", "showwarning",
+                      "formatwarning", "filterwarnings", "simplefilter",
+                      "resetwarnings", "catch_warnings"]
+        self.assertSetEqual(set(self.module.__all__),
+                            set(target_api))
+
+class CPublicAPITests(PublicAPITests, unittest.TestCase):
+    module = c_warnings
+
+class PyPublicAPITests(PublicAPITests, unittest.TestCase):
+    module = py_warnings
 
 class FilterTests(BaseTest):
 
diff --git a/Lib/warnings.py b/Lib/warnings.py
index f37b8a771a..e53efa52b0 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -2,7 +2,8 @@
 
 import sys
 
-__all__ = ["warn", "showwarning", "formatwarning", "filterwarnings",
+__all__ = ["warn", "warn_explicit", "showwarning",
+           "formatwarning", "filterwarnings", "simplefilter",
            "resetwarnings", "catch_warnings"]
 
 
diff --git a/Misc/ACKS b/Misc/ACKS
index dad83f6582..bc96b93a87 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1063,6 +1063,7 @@ Antoine Pitrou
 Jean-François Piéronne
 Oleg Plakhotnyuk
 Remi Pointel
+Jon Poler
 Ariel Poliak
 Guilherme Polo
 Illia Polosukhin