[Python-checkins] cpython (merge 3.4 -> default): Issue #23418: Add missing entries to http.server.__all__.

[berker.peksag]

https://hg.python.org/cpython/rev/03e3e78014ea
changeset:   94603:03e3e78014ea
parent:      94601:1784c1901af6
parent:      94602:d2dbec7d74d0
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Fri Feb 13 20:48:41 2015 +0200
summary:
  Issue #23418: Add missing entries to http.server.__all__.

Patch by Martin Panter.

files:
  Lib/http/server.py           |   5 ++++-
  Lib/test/test_httpservers.py |  14 ++++++++++++++
  2 files changed, 18 insertions(+), 1 deletions(-)


diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -82,7 +82,10 @@
 
 __version__ = "0.6"
 
-__all__ = ["HTTPServer", "BaseHTTPRequestHandler"]
+__all__ = [
+    "HTTPServer", "BaseHTTPRequestHandler",
+    "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler",
+]
 
 import html
 import http.client
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -760,6 +760,19 @@
         self.assertEqual(path, self.translated)
 
 
+class MiscTestCase(unittest.TestCase):
+    def test_all(self):
+        expected = []
+        blacklist = {'executable', 'nobody_uid', 'test'}
+        for name in dir(server):
+            if name.startswith('_') or name in blacklist:
+                continue
+            module_object = getattr(server, name)
+            if getattr(module_object, '__module__', None) == 'http.server':
+                expected.append(name)
+        self.assertCountEqual(server.__all__, expected)
+
+
 def test_main(verbose=None):
     cwd = os.getcwd()
     try:
@@ -769,6 +782,7 @@
             SimpleHTTPServerTestCase,
             CGIHTTPServerTestCase,
             SimpleHTTPRequestHandlerTestCase,
+            MiscTestCase,
         )
     finally:
         os.chdir(cwd)

-- 
Repository URL: https://hg.python.org/cpython