[style] change python yapf column_limit to 119 (#5339)

This commit is contained in:
Simon Lin
2020-08-06 21:40:24 -07:00
committed by GitHub
parent e810357adb
commit d7343c877b
150 changed files with 2910 additions and 5676 deletions
+27 -54
View File
@@ -92,8 +92,7 @@ class AlertDescription(IntEnum):
class Record(ConvertibleToBytes, BuildableFromBytes):
def __init__(self, content_type, version, epoch, sequence_number, length,
fragment):
def __init__(self, content_type, version, epoch, sequence_number, length, fragment):
self.content_type = content_type
self.version = version
self.epoch = epoch
@@ -102,10 +101,8 @@ class Record(ConvertibleToBytes, BuildableFromBytes):
self.fragment = fragment
def to_bytes(self):
return (struct.pack(">B", self.content_type) + self.version.to_bytes() +
struct.pack(">H", self.epoch) +
self.sequence_number.to_bytes(6, byteorder='big') +
struct.pack(">H", self.length) + self.fragment)
return (struct.pack(">B", self.content_type) + self.version.to_bytes() + struct.pack(">H", self.epoch) +
self.sequence_number.to_bytes(6, byteorder='big') + struct.pack(">H", self.length) + self.fragment)
@classmethod
def from_bytes(cls, data):
@@ -115,8 +112,7 @@ class Record(ConvertibleToBytes, BuildableFromBytes):
sequence_number = struct.unpack(">Q", b'\x00\x00' + data.read(6))[0]
length = struct.unpack(">H", data.read(2))[0]
fragment = bytes(data.read(length))
return cls(content_type, version, epoch, sequence_number, length,
fragment)
return cls(content_type, version, epoch, sequence_number, length, fragment)
def __repr__(self):
return "Record(content_type={}, version={}, epoch={}, sequence_number={}, length={})".format(
@@ -161,12 +157,9 @@ class HandshakeMessage(Message):
self.body = body
def to_bytes(self):
return (struct.pack(">B", self.handshake_type) +
struct.pack(">I", self.length)[1:] +
struct.pack(">H", self.message_seq) +
struct.pack(">I", self.fragment_offset)[1:] +
struct.pack(">I", self.fragment_length)[1:] +
self.body.to_bytes())
return (struct.pack(">B", self.handshake_type) + struct.pack(">I", self.length)[1:] +
struct.pack(">H", self.message_seq) + struct.pack(">I", self.fragment_offset)[1:] +
struct.pack(">I", self.fragment_length)[1:] + self.body.to_bytes())
@classmethod
def from_bytes(cls, data):
@@ -196,8 +189,7 @@ class HandshakeMessage(Message):
)
def __repr__(self):
return "Handshake(type={}, length={})".format(str(self.handshake_type),
self.length)
return "Handshake(type={}, length={})".format(str(self.handshake_type), self.length)
class ProtocolVersion(ConvertibleToBytes, BuildableFromBytes):
@@ -207,8 +199,7 @@ class ProtocolVersion(ConvertibleToBytes, BuildableFromBytes):
self.minor = minor
def __eq__(self, other):
return (isinstance(self, type(other)) and self.major == other.major and
self.minor == other.minor)
return (isinstance(self, type(other)) and self.major == other.major and self.minor == other.minor)
def to_bytes(self):
return struct.pack(">BB", self.major, self.minor)
@@ -219,8 +210,7 @@ class ProtocolVersion(ConvertibleToBytes, BuildableFromBytes):
return cls(major, minor)
def __repr__(self):
return "ProtocolVersion(major={}, minor={})".format(
self.major, self.minor)
return "ProtocolVersion(major={}, minor={})".format(self.major, self.minor)
class Random(ConvertibleToBytes, BuildableFromBytes):
@@ -233,8 +223,7 @@ class Random(ConvertibleToBytes, BuildableFromBytes):
assert len(self.random_bytes) == Random.random_bytes_length
def __eq__(self, other):
return (isinstance(self, type(other)) and
self.gmt_unix_time == other.gmt_unix_time and
return (isinstance(self, type(other)) and self.gmt_unix_time == other.gmt_unix_time and
self.random_bytes == other.random_bytes)
def to_bytes(self):
@@ -259,9 +248,7 @@ class VariableVector(ConvertibleToBytes):
return len(self.elements)
def __eq__(self, other):
return (isinstance(self, type(other)) and
self.subrange == other.subrange and
self.ele_cls == other.ele_cls and
return (isinstance(self, type(other)) and self.subrange == other.subrange and self.ele_cls == other.ele_cls and
self.elements == other.elements)
def to_bytes(self):
@@ -362,13 +349,11 @@ class Extension(ConvertibleToBytes, BuildableFromBytes):
self.extension_data = extension_data
def __eq__(self, other):
return (isinstance(self, type(other)) and
self.extension_type == other.extension_type and
return (isinstance(self, type(other)) and self.extension_type == other.extension_type and
self.extension_data == other.extension_data)
def to_bytes(self):
return (struct.pack(">H", self.extension_type) +
self.extension_data.to_bytes())
return (struct.pack(">H", self.extension_type) + self.extension_data.to_bytes())
@classmethod
def from_bytes(cls, data):
@@ -398,10 +383,8 @@ class ClientHello(HandshakeMessage):
self.extensions = extensions
def to_bytes(self):
return (self.client_version.to_bytes() + self.random.to_bytes() +
self.session_id.to_bytes() + self.cookie.to_bytes() +
self.cipher_suites.to_bytes() +
self.compression_methods.to_bytes() +
return (self.client_version.to_bytes() + self.random.to_bytes() + self.session_id.to_bytes() +
self.cookie.to_bytes() + self.cipher_suites.to_bytes() + self.compression_methods.to_bytes() +
self.extensions.to_bytes())
@classmethod
@@ -410,14 +393,11 @@ class ClientHello(HandshakeMessage):
random = Random.from_bytes(data)
session_id = VariableVector.from_bytes(Opaque, (0, 32), data)
cookie = VariableVector.from_bytes(Opaque, (0, 2**8 - 1), data)
cipher_suites = VariableVector.from_bytes(CipherSuite, (2, 2**16 - 1),
data)
compression_methods = VariableVector.from_bytes(CompressionMethod,
(1, 2**8 - 1), data)
cipher_suites = VariableVector.from_bytes(CipherSuite, (2, 2**16 - 1), data)
compression_methods = VariableVector.from_bytes(CompressionMethod, (1, 2**8 - 1), data)
extensions = None
if data.tell() < len(data.getvalue()):
extensions = VariableVector.from_bytes(Extension, (0, 2**16 - 1),
data)
extensions = VariableVector.from_bytes(Extension, (0, 2**16 - 1), data)
return cls(
client_version,
random,
@@ -464,9 +444,8 @@ class ServerHello(HandshakeMessage):
self.extensions = extensions
def to_bytes(self):
return (self.server_version.to_bytes() + self.random.to_bytes() +
self.session_id.to_bytes() + self.cipher_suite.to_bytes() +
self.compression_method.to_bytes() + self.extensions.to_bytes())
return (self.server_version.to_bytes() + self.random.to_bytes() + self.session_id.to_bytes() +
self.cipher_suite.to_bytes() + self.compression_method.to_bytes() + self.extensions.to_bytes())
@classmethod
def from_bytes(cls, data):
@@ -477,8 +456,7 @@ class ServerHello(HandshakeMessage):
compression_method = CompressionMethod.from_bytes(data)
extensions = None
if data.tell() < len(data.getvalue()):
extensions = VariableVector.from_bytes(Extension, (0, 2**16 - 1),
data)
extensions = VariableVector.from_bytes(Extension, (0, 2**16 - 1), data)
return cls(
server_version,
random,
@@ -565,15 +543,13 @@ class AlertMessage(Message):
return cls(None, None)
def __repr__(self):
return "Alert(level={}, description={})".format(str(self.level),
str(self.description))
return "Alert(level={}, description={})".format(str(self.level), str(self.description))
class ChangeCipherSpecMessage(Message):
def __init__(self):
super(ChangeCipherSpecMessage,
self).__init__(ContentType.CHANGE_CIPHER_SPEC)
super(ChangeCipherSpecMessage, self).__init__(ContentType.CHANGE_CIPHER_SPEC)
def to_bytes(self):
return struct.pack(">B", 1)
@@ -590,8 +566,7 @@ class ChangeCipherSpecMessage(Message):
class ApplicationDataMessage(Message):
def __init__(self, raw):
super(ApplicationDataMessage,
self).__init__(ContentType.APPLICATION_DATA)
super(ApplicationDataMessage, self).__init__(ContentType.APPLICATION_DATA)
self.raw = raw
self.body = None
@@ -651,10 +626,8 @@ class MessageFactory(object):
if record.version.major != 0xfe or record.version.minor != 0xFD:
raise ValueError("DTLS version error, expect DTLSv1.2")
last_msg_is_change_cipher_spec = type(
self).last_msg_is_change_cipher_spec
type(self).last_msg_is_change_cipher_spec = (
record.content_type == ContentType.CHANGE_CIPHER_SPEC)
last_msg_is_change_cipher_spec = type(self).last_msg_is_change_cipher_spec
type(self).last_msg_is_change_cipher_spec = (record.content_type == ContentType.CHANGE_CIPHER_SPEC)
# FINISHED message immediately follows CHANGE_CIPHER_SPEC message
# We skip FINISHED message as it is encrypted