Merge branch 'master' into upgrader

This commit is contained in:
Alex Haynes
2018-11-11 19:43:16 -05:00
committed by GitHub
2 changed files with 2 additions and 3 deletions

View File

@ -8,7 +8,7 @@ class Multiplex(object):
def __init__(self, conn, initiator): def __init__(self, conn, initiator):
""" """
:param conn: an instance of raw connection :param conn: an instance of raw connection
: param initiator: boolean to prevent multiplex with self :param initiator: boolean to prevent multiplex with self
""" """
self.muxed_conn = MuxedConn(conn, initiator) self.muxed_conn = MuxedConn(conn, initiator)

View File

@ -26,4 +26,3 @@ class TransportUpgrader(object):
# TODO do exchange to determine multiplexer # TODO do exchange to determine multiplexer
return MuxedConn(conn, initiator) return MuxedConn(conn, initiator)