Don't lie in __all__ attributes when SSL is not available: only add the SSL
classes when they are actually created.
This commit is contained in:
parent
dcb3c382ac
commit
a6900e8d72
|
@ -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
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue