Don't lie in __all__ attributes when SSL is not available: only add the SSL

classes when they are actually created.

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 599a3314c92972e5c4d0511dc24a3dcc3f26b605..b9e59d0871f9e9d33bb59dc4fa6e8bf5284f2f6a 100644 (file)
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -76,7 +76,7 @@ try:
 except ImportError:
     from StringIO import StringIO
 
-__all__ = ["HTTP", "HTTPResponse", "HTTPConnection", "HTTPSConnection",
+__all__ = ["HTTP", "HTTPResponse", "HTTPConnection",
            "HTTPException", "NotConnected", "UnknownProtocol",
            "UnknownTransferEncoding", "UnimplementedFileMode",
            "IncompleteRead", "InvalidURL", "ImproperConnectionState",
@@ -1052,6 +1052,7 @@ else:
             sock = socket.create_connection((self.host, self.port), self.timeout)
             self.sock = ssl.sslsocket(sock, self.key_file, self.cert_file)
 
+    __all__.append("HTTPSConnection")
 
     class HTTPS(HTTP):
         """Compatibility with 1.5 httplib interface

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 7e3a046798e128427814720e7673891b866250a5..8ca9358afb535e2afe00d67f221e4ca8ec528be7 100644 (file)
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -24,7 +24,7 @@ __version__ = "2.58"
 
 import binascii, os, random, re, socket, sys, time
 
-__all__ = ["IMAP4", "IMAP4_SSL", "IMAP4_stream", "Internaldate2tuple",
+__all__ = ["IMAP4", "IMAP4_stream", "Internaldate2tuple",
            "Int2AP", "ParseFlags", "Time2Internaldate"]
 
 #       Globals
@@ -1205,6 +1205,7 @@ else:
             """
             return self.sslobj
 
+    __all__.append("IMAP4_SSL")
 
 
 class IMAP4_stream(IMAP4):

diff --git a/Lib/poplib.py b/Lib/poplib.py
index 58ebb509d2776bf19909a5baadf89fa4589109b8..c4215298368f04bad8d047265260d8eb3145c050 100644 (file)
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -15,7 +15,7 @@ Based on the J. Myers POP3 draft, Jan. 96
 
 import re, socket
 
-__all__ = ["POP3","error_proto","POP3_SSL"]
+__all__ = ["POP3","error_proto"]
 
 # Exception raised when an error or invalid response is received:
 
@@ -397,6 +397,7 @@ else:
             del self.sslobj, self.sock
             return resp
 
+    __all__.append("POP3_SSL")
 
 if __name__ == "__main__":
     import sys

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 874d9704ec18a1509fc4fbaf43fe9422f52daab8..5b2c6a013ac4b641240ed6838763e4018b7aa80a 100755 (executable)
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -52,7 +52,7 @@ from sys import stderr
 __all__ = ["SMTPException","SMTPServerDisconnected","SMTPResponseException",
            "SMTPSenderRefused","SMTPRecipientsRefused","SMTPDataError",
            "SMTPConnectError","SMTPHeloError","SMTPAuthenticationError",
-           "quoteaddr","quotedata","SMTP","SMTP_SSL"]
+           "quoteaddr","quotedata","SMTP"]
 
 SMTP_PORT = 25
 SMTP_SSL_PORT = 465
@@ -725,6 +725,8 @@ if _have_ssl:
             self.sock = SSLFakeSocket(self.sock, sslobj)
             self.file = SSLFakeFile(sslobj)
 
+    __all__.append("SMTP_SSL")
+
 #
 # LMTP extension
 #