espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-09 12:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[style] update python style to conform to PEP 8 (#3951)

Browse Source 
With the exception of line length set to 119 vs. 79.

Add tests/ and tools/ to py-pretty-check.
This commit is contained in:
Jonathan Hui
2019-07-11 11:45:55 -04:00
committed by GitHub
parent a938ee2845
commit f924adcb60
341 changed files with 8702 additions and 4460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/scripts/thread-cert/network_data.py
+102 -71
View File
@@ -49,7 +49,6 @@ class TlvType(IntEnum):
class NetworkData(object):
def __init__(self, stable):
self._stable = stable
@@ -59,7 +58,6 @@ class NetworkData(object):
class NetworkDataSubTlvsFactory(SubTlvsFactory):
def parse(self, data, message_info):
sub_tlvs = []
@@ -67,7 +65,7 @@ class NetworkDataSubTlvsFactory(SubTlvsFactory):
data_byte = ord(data.read(1))
stable = data_byte & 0x01
_type = (data_byte >> 1) & 0x7f
_type = (data_byte >> 1) & 0x7F
length = ord(data.read(1))
value = data.read(length)
@@ -83,7 +81,6 @@ class NetworkDataSubTlvsFactory(SubTlvsFactory):
class Route(object):
def __init__(self, border_router_16, prf):
self._border_router_16 = border_router_16
self._prf = prf
@@ -99,14 +96,18 @@ class Route(object):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.border_router_16 == other.border_router_16 and self.prf == other.prf
return (
self.border_router_16 == other.border_router_16
and self.prf == other.prf
)
def __repr__(self):
return "Route(border_router_16={}, prf={})".format(self.border_router_16, self.prf)
return "Route(border_router_16={}, prf={})".format(
self.border_router_16, self.prf
)
class RouteFactory(object):
def parse(self, data, message_info):
border_router_16 = struct.unpack(">H", data.read(2))[0]
@@ -117,7 +118,6 @@ class RouteFactory(object):
class RoutesFactory(object):
def __init__(self, route_factory):
self._route_factory = route_factory
@@ -133,7 +133,6 @@ class RoutesFactory(object):
class HasRoute(NetworkData):
def __init__(self, routes, stable):
super(HasRoute, self).__init__(stable)
self._routes = routes
@@ -149,11 +148,12 @@ class HasRoute(NetworkData):
def __repr__(self):
routes_str = ", ".join(["{}".format(route) for route in self.routes])
return "HasRoute(stable={}, routes=[{}])".format(self.stable, routes_str)
return "HasRoute(stable={}, routes=[{}])".format(
self.stable, routes_str
)
class HasRouteFactory(object):
def __init__(self, routes_factory):
self._routes_factory = routes_factory
@@ -164,7 +164,6 @@ class HasRouteFactory(object):
class Prefix(NetworkData):
def __init__(self, domain_id, prefix_length, prefix, sub_tlvs, stable):
super(Prefix, self).__init__(stable)
self._domain_id = domain_id
@@ -191,25 +190,25 @@ class Prefix(NetworkData):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.domain_id == other.domain_id and \
self.prefix_length == other.prefix_length and \
self.prefix == other.prefix and \
self.sub_tlvs == other.sub_tlvs
return (
self.domain_id == other.domain_id
and self.prefix_length == other.prefix_length
and self.prefix == other.prefix
and self.sub_tlvs == other.sub_tlvs
)
def __repr__(self):
sub_tlvs_str = ", ".join(["{}".format(tlv) for tlv in self.sub_tlvs])
return "Prefix(stable={}, domain_id={}, prefix_length={}, prefix={}, sub_tlvs=[{}])".format(
self.stable, self.domain_id, self.prefix_length, hexlify(self.prefix), sub_tlvs_str)
self.stable, self.domain_id, self.prefix_length, hexlify(self.prefix), sub_tlvs_str, )
class PrefixSubTlvsFactory(NetworkDataSubTlvsFactory):
def __init__(self, sub_tlvs_factories):
super(PrefixSubTlvsFactory, self).__init__(sub_tlvs_factories)
class PrefixFactory(object):
def __init__(self, sub_tlvs_factory):
self._sub_tlvs_factory = sub_tlvs_factory
@@ -223,13 +222,16 @@ class PrefixFactory(object):
prefix = bytearray(data.read(self._bits_to_bytes(prefix_length)))
sub_tlvs = self._sub_tlvs_factory.parse(io.BytesIO(data.read()), message_info)
sub_tlvs = self._sub_tlvs_factory.parse(
io.BytesIO(data.read()), message_info
)
return Prefix(domain_id, prefix_length, prefix, sub_tlvs, message_info.stable)
return Prefix(
domain_id, prefix_length, prefix, sub_tlvs, message_info.stable
)
class BorderRouter(NetworkData):
def __init__(self, border_router_16, prf, p, s, d, c, r, o, n, stable):
super(BorderRouter, self).__init__(stable)
self._border_router_16 = border_router_16
@@ -281,28 +283,29 @@ class BorderRouter(NetworkData):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.border_router_16 == other.border_router_16 and \
self.prf == other.prf and \
self.p == other.p and \
self.s == other.s and \
self.d == other.d and \
self.c == other.c and \
self.r == other.r and \
self.o == other.o and \
self.n == other.n
return (
self.border_router_16 == other.border_router_16
and self.prf == other.prf
and self.p == other.p
and self.s == other.s
and self.d == other.d
and self.c == other.c
and self.r == other.r
and self.o == other.o
and self.n == other.n
)
def __repr__(self):
return "BorderRouter(stable={}, border_router_16={}, prf={}, p={}, s={}, d={}, c={}, r={}, o={}, n={})".format(
self.stable, self.border_router_16, self.prf, self.p, self.s, self.d, self.c, self.r, self.o, self.n)
self.stable, self.border_router_16, self.prf, self.p, self.s, self.d, self.c, self.r, self.o, self.n, )
class BorderRouterFactory(object):
def parse(self, data, message_info):
border_router_16 = struct.unpack(">H", data.read(2))[0]
data_byte = ord(data.read(1))
o = (data_byte & 0x01)
o = data_byte & 0x01
r = (data_byte >> 1) & 0x01
c = (data_byte >> 2) & 0x01
d = (data_byte >> 3) & 0x01
@@ -313,11 +316,12 @@ class BorderRouterFactory(object):
data_byte = ord(data.read(1))
n = (data_byte >> 7) & 0x01
return BorderRouter(border_router_16, prf, p, s, d, c, r, o, n, message_info.stable)
return BorderRouter(
border_router_16, prf, p, s, d, c, r, o, n, message_info.stable
)
class LowpanId(NetworkData):
def __init__(self, c, cid, context_length, stable):
super(LowpanId, self).__init__(stable)
self._c = c
@@ -339,21 +343,23 @@ class LowpanId(NetworkData):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.c == other.c and \
self.cid == other.cid and \
self.context_length == other.context_length
return (
self.c == other.c
and self.cid == other.cid
and self.context_length == other.context_length
)
def __repr__(self):
return "LowpanId(stable={}, c={}, cid={}, context_length={})".format(
self.stable, self.c, self.cid, self.context_length)
self.stable, self.c, self.cid, self.context_length
)
class LowpanIdFactory(object):
def parse(self, data, message_info):
data_byte = ord(data.read(1))
cid = (data_byte & 0x0f)
cid = data_byte & 0x0F
c = (data_byte >> 4) & 0x01
context_length = ord(data.read(1))
@@ -362,7 +368,6 @@ class LowpanIdFactory(object):
class CommissioningData(NetworkData):
def __init__(self, sub_tlvs, stable):
super(CommissioningData, self).__init__(stable)
self._sub_tlvs = sub_tlvs
@@ -374,33 +379,47 @@ class CommissioningData(NetworkData):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.sub_tlvs == other.sub_tlvs
return self.sub_tlvs == other.sub_tlvs
def __repr__(self):
sub_tlvs_str = ", ".format(["{}".format(tlv) for tlv in self._sub_tlvs])
sub_tlvs_str = ", ".format(
["{}".format(tlv) for tlv in self._sub_tlvs]
)
return "CommissioningData(stable={}, sub_tlvs=[{}])".format(
self._stable, sub_tlvs_str)
self._stable, sub_tlvs_str
)
class CommissioningDataSubTlvsFactory(SubTlvsFactory):
def __init__(self, sub_tlvs_factories):
super(CommissioningDataSubTlvsFactory, self).__init__(sub_tlvs_factories)
super(CommissioningDataSubTlvsFactory, self).__init__(
sub_tlvs_factories
)
class CommissioningDataFactory(object):
def __init__(self, sub_tlvs_factory):
self._sub_tlvs_factory = sub_tlvs_factory
def parse(self, data, message_info):
sub_tlvs = self._sub_tlvs_factory.parse(io.BytesIO(data.read()), message_info)
sub_tlvs = self._sub_tlvs_factory.parse(
io.BytesIO(data.read()), message_info
)
return CommissioningData(sub_tlvs, message_info.stable)
class Service(NetworkData):
def __init__(self, t, _id, enterprise_number, service_data_length, service_data, sub_tlvs, stable):
class Service(NetworkData):
def __init__(
self,
t,
_id,
enterprise_number,
service_data_length,
service_data,
sub_tlvs,
stable,
):
super(Service, self).__init__(stable)
self._t = t
self._id = _id
@@ -436,46 +455,57 @@ class Service(NetworkData):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.t == other.t and \
self.id == other.id and \
self.enterprise_number == other.enterprise_number and \
self.service_data_length == other.service_data_length and \
self.service_data == other.service_data and \
self.sub_tlvs == other.sub_tlvs
return (
self.t == other.t
and self.id == other.id
and self.enterprise_number == other.enterprise_number
and self.service_data_length == other.service_data_length
and self.service_data == other.service_data
and self.sub_tlvs == other.sub_tlvs
)
def __repr__(self):
sub_tlvs_str = ", ".format(["{}".format(tlv) for tlv in self.sub_tlvs])
return "LowpanId(stable={}, t={}, id={}, enterprise_number={}, service_data_length={}, service_data={}, sub_tlvs=[{}])".format(
self.stable, self.t, self.id, self.enterprise_number, self.service_data_length, self.service_data, sub_tlvs_str)
return ("LowpanId(stable={}, t={}, id={}, enterprise_number={}, service_data_length={}, service_data={},",
"sub_tlvs=[{}])").format(
self.stable, self.t, self.id, self.enterprise_number, self.service_data_length, self.service_data,
sub_tlvs_str, )
class ServiceSubTlvsFactory(NetworkDataSubTlvsFactory):
def __init__(self, sub_tlvs_factories):
super(ServiceSubTlvsFactory, self).__init__(sub_tlvs_factories)
class ServiceFactory(object):
def __init__(self, sub_tlvs_factory):
self._sub_tlvs_factory = sub_tlvs_factory
def parse(self, data, message_info):
data_byte = ord(data.read(1))
t = (data_byte >> 7) & 0x01
_id = (data_byte & 0x0f)
_id = data_byte & 0x0F
enterprise_number = struct.unpack(">L", data.read(4))[0]
service_data_length = ord(data.read(1))
service_data = data.read(service_data_length)
sub_tlvs = self._sub_tlvs_factory.parse(io.BytesIO(data.read()), message_info)
sub_tlvs = self._sub_tlvs_factory.parse(
io.BytesIO(data.read()), message_info
)
return Service(t, _id, enterprise_number, service_data_length, service_data, sub_tlvs, message_info.stable)
return Service(
t,
_id,
enterprise_number,
service_data_length,
service_data,
sub_tlvs,
message_info.stable,
)
class Server(NetworkData):
def __init__(self, server_16, server_data, stable):
super(Server, self).__init__(stable)
self._server_16 = server_16
@@ -492,16 +522,18 @@ class Server(NetworkData):
def __eq__(self, other):
common.expect_the_same_class(self, other)
return self.server_16 == other.server_16 and \
self.server_data == other.server_data
return (
self.server_16 == other.server_16
and self.server_data == other.server_data
)
def __repr__(self):
return "LowpanId(stable={}, server_16={}, server_data=b'{}')".format(
self.stable, self.server_16, hexlify(self.server_data))
self.stable, self.server_16, hexlify(self.server_data)
)
class ServerFactory(object):
def parse(self, data, message_info):
server_16 = struct.unpack(">H", data.read(2))[0]
server_data = bytearray(data.read())
@@ -510,6 +542,5 @@ class ServerFactory(object):
class NetworkDataTlvsFactory(NetworkDataSubTlvsFactory):
def __init__(self, sub_tlvs_factories):
super(NetworkDataTlvsFactory, self).__init__(sub_tlvs_factories)