# HG changeset patch
# Parent b5a953ffb2bec979c50bc4ea29a37af13888b2ad
diff -r b5a953ffb2be -r cf9007048641 Lib/http/server.py
--- a/Lib/http/server.py	Sun Feb 08 14:07:35 2015 -0800
+++ b/Lib/http/server.py	Mon Feb 09 07:01:11 2015 +0000
@@ -82,7 +82,10 @@
 
 __version__ = "0.6"
 
-__all__ = ["HTTPServer", "BaseHTTPRequestHandler"]
+__all__ = [
+    "HTTPServer", "BaseHTTPRequestHandler",
+    "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler",
+]
 
 import html
 import http.client
diff -r b5a953ffb2be -r cf9007048641 Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py	Sun Feb 08 14:07:35 2015 -0800
+++ b/Lib/test/test_httpservers.py	Mon Feb 09 07:01:11 2015 +0000
@@ -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
+            object = getattr(server, name)
+            if getattr(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)