Update tlslite to 0.4.6.

third_party/tlslite/tlslite/api.py

Index: third_party/tlslite/tlslite/api.py
diff --git a/third_party/tlslite/tlslite/api.py b/third_party/tlslite/tlslite/api.py
index 71d51377244d8cff9abdb3f0903525238b3a8802..faef6cb1fad6c3e529ab9e6f2180e95e8abebcd8 100644
--- a/third_party/tlslite/tlslite/api.py
+++ b/third_party/tlslite/tlslite/api.py
@@ -1,75 +1,31 @@
-"""Import this module for easy access to TLS Lite objects.
-
-The TLS Lite API consists of classes, functions, and variables spread
-throughout this package.  Instead of importing them individually with::
-
-    from tlslite.tlsconnection import TLSConnection
-    from tlslite.handshakesettings import HandshakeSettings
-    from tlslite.errors import *
-    .
-    .
-
-It's easier to do::
-
-    from tlslite.api import *
-
-This imports all the important objects (TLSConnection, Checker,
-HandshakeSettings, etc.) into the global namespace.  In particular, it
-imports::
-
-    from constants import AlertLevel, AlertDescription, Fault
-    from errors import *
-    from checker import Checker
-    from handshakesettings import HandshakeSettings
-    from session import Session
-    from sessioncache import SessionCache
-    from sharedkeydb import SharedKeyDB
-    from tlsconnection import TLSConnection
-    from verifierdb import VerifierDB
-    from x509 import X509
-    from x509certchain import X509CertChain
-
-    from integration.httptlsconnection import HTTPTLSConnection
-    from integration.pop3_tls import POP3_TLS
-    from integration.imap4_tls import IMAP4_TLS
-    from integration.smtp_tls import SMTP_TLS
-    from integration.xmlrpctransport import XMLRPCTransport
-    from integration.tlssocketservermixin import TLSSocketServerMixIn
-    from integration.tlsasyncdispatchermixin import TLSAsyncDispatcherMixIn
-    from integration.tlstwistedprotocolwrapper import TLSTwistedProtocolWrapper
-    from utils.cryptomath import cryptlibpyLoaded, m2cryptoLoaded,
-                                 gmpyLoaded, pycryptoLoaded, prngName
-    from utils.keyfactory import generateRSAKey, parsePEMKey, parseXMLKey,
-                                 parseAsPublicKey, parsePrivateKey
-"""
-
-from constants import AlertLevel, AlertDescription, Fault
-from errors import *
-from checker import Checker
-from handshakesettings import HandshakeSettings
-from session import Session
-from sessioncache import SessionCache
-from sharedkeydb import SharedKeyDB
-from tlsconnection import TLSConnection
-from verifierdb import VerifierDB
-from x509 import X509
-from x509certchain import X509CertChain
-
-from integration.httptlsconnection import HTTPTLSConnection
-from integration.tlssocketservermixin import TLSSocketServerMixIn
-from integration.tlsasyncdispatchermixin import TLSAsyncDispatcherMixIn
-from integration.pop3_tls import POP3_TLS
-from integration.imap4_tls import IMAP4_TLS
-from integration.smtp_tls import SMTP_TLS
-from integration.xmlrpctransport import XMLRPCTransport
-try:
-    import twisted
-    del(twisted)
-    from integration.tlstwistedprotocolwrapper import TLSTwistedProtocolWrapper
-except ImportError:
-    pass
-
-from utils.cryptomath import cryptlibpyLoaded, m2cryptoLoaded, gmpyLoaded, \
+# Author: Trevor Perrin
+# See the LICENSE file for legal information regarding use of this file.
+
+__version__ = "0.4.6"
+from .constants import AlertLevel, AlertDescription, Fault
+from .errors import *
+from .checker import Checker
+from .handshakesettings import HandshakeSettings
+from .session import Session
+from .sessioncache import SessionCache
+from .tlsconnection import TLSConnection
+from .verifierdb import VerifierDB
+from .x509 import X509
+from .x509certchain import X509CertChain
+
+from .integration.httptlsconnection import HTTPTLSConnection
+from .integration.tlssocketservermixin import TLSSocketServerMixIn
+from .integration.tlsasyncdispatchermixin import TLSAsyncDispatcherMixIn
+from .integration.pop3_tls import POP3_TLS
+from .integration.imap4_tls import IMAP4_TLS
+from .integration.smtp_tls import SMTP_TLS
+from .integration.xmlrpctransport import XMLRPCTransport
+from .integration.xmlrpcserver import TLSXMLRPCRequestHandler, \
+                                      TLSXMLRPCServer, \
+                                      MultiPathTLSXMLRPCServer
+
+from .utils.cryptomath import m2cryptoLoaded, gmpyLoaded, \
                              pycryptoLoaded, prngName
-from utils.keyfactory import generateRSAKey, parsePEMKey, parseXMLKey, \
+from .utils.keyfactory import generateRSAKey, parsePEMKey, \
                              parseAsPublicKey, parsePrivateKey
+from .utils.tackwrapper import tackpyLoaded