Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: third_party/tlslite/tlslite/integration/tlsasyncdispatchermixin.py

Issue 210323002: Update tlslite to 0.4.6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More policy_testserver.py Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tlslite/tlslite/integration/tlsasyncdispatchermixin.py
diff --git a/third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py b/third_party/tlslite/tlslite/integration/tlsasyncdispatchermixin.py
similarity index 93%
rename from third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py
rename to third_party/tlslite/tlslite/integration/tlsasyncdispatchermixin.py
index fd9868ff1c4e0e4c313017ab31f1a917086709d9..dc3259662ab3f165a91a4220f8cf894d9d1a2a1e 100644
--- a/third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py
+++ b/third_party/tlslite/tlslite/integration/tlsasyncdispatchermixin.py
@@ -1,9 +1,15 @@
+# Authors:
+# Trevor Perrin
+# Martin von Loewis - python 3 port
+#
+# See the LICENSE file for legal information regarding use of this file.
+
"""TLS Lite + asyncore."""
import asyncore
-from tlslite.TLSConnection import TLSConnection
-from AsyncStateMachine import AsyncStateMachine
+from tlslite.tlsconnection import TLSConnection
+from .asyncstatemachine import AsyncStateMachine
class TLSAsyncDispatcherMixIn(AsyncStateMachine):
@@ -41,7 +47,7 @@ class TLSAsyncDispatcherMixIn(AsyncStateMachine):
Add the following text into 'start_medusa.py', in the 'HTTP Server'
section::
- from tlslite.api import *
+ from tlslite import *
s = open("./serverX509Cert.pem").read()
x509 = X509()
x509.parse(s)
@@ -136,4 +142,4 @@ class TLSAsyncDispatcherMixIn(AsyncStateMachine):
if hasattr(self, "tlsConnection"):
self.setCloseOp()
else:
- asyncore.dispatcher.close(self)
+ asyncore.dispatcher.close(self)
« no previous file with comments | « third_party/tlslite/tlslite/integration/smtp_tls.py ('k') | third_party/tlslite/tlslite/integration/tlssocketservermixin.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698