third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py - Issue 211173006: Perform tlslite 0.3.8 -> 0.4.6 renames ahead of time.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 211173006: Perform tlslite 0.3.8 -> 0.4.6 renames ahead of time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Drop the -B 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

« no previous file with comments | « third_party/tlslite/tlslite/integration/TLSSocketServerMixIn.py ('k') | third_party/tlslite/tlslite/integration/XMLRPCTransport.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py

diff --git a/third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py b/third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py

index 6e1b5cadbf07fb8764b1fb1690f601da872ac445..0a83d376fe95a05e9ff5a5fd82e9a45b2a6a2dd5 100644

--- a/third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py

+++ b/third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py

@@ -3,8 +3,8 @@

from twisted.protocols.policies import ProtocolWrapper, WrappingFactory

from twisted.python.failure import Failure

-from AsyncStateMachine import AsyncStateMachine

-from tlslite.TLSConnection import TLSConnection

+from asyncstatemachine import AsyncStateMachine

+from tlslite.tlsconnection import TLSConnection

from tlslite.errors import *

import socket

@@ -193,4 +193,4 @@ class TLSTwistedProtocolWrapper(ProtocolWrapper, AsyncStateMachine):

else:

#Because of the FakeSocket, write operations are guaranteed to

#terminate immediately.

- AsyncStateMachine.setWriteOp(self, "".join(seq))

+ AsyncStateMachine.setWriteOp(self, "".join(seq))