Migrate to black 20.8b1

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
         args:

tests/application/test_requests.py

@@ -92,7 +92,11 @@ async def test_zigpy_request(device, make_application):
         ),
         responses=[
             c.AF.DataRequestExt.Rsp(Status=t.Status.SUCCESS),
-            c.AF.DataConfirm.Callback(Status=t.Status.SUCCESS, Endpoint=1, TSN=TSN,),
+            c.AF.DataConfirm.Callback(
+                Status=t.Status.SUCCESS,
+                Endpoint=1,
+                TSN=TSN,
+            ),
             c.ZDO.SrcRtgInd.Callback(DstAddr=device.nwk, Relays=[]),
             c.AF.IncomingMsg.Callback(
                 GroupId=0x0000,
@@ -149,7 +153,11 @@ async def test_zigpy_request_failure(device, make_application, mocker):
         ),
         responses=[
             c.AF.DataRequestExt.Rsp(Status=t.Status.SUCCESS),
-            c.AF.DataConfirm.Callback(Status=t.Status.FAILURE, Endpoint=1, TSN=TSN,),
+            c.AF.DataConfirm.Callback(
+                Status=t.Status.FAILURE,
+                Endpoint=1,
+                TSN=TSN,
+            ),
         ],
     )
 

tests/conftest.py

@@ -292,7 +292,8 @@ def __init__(self, *args, **kwargs):
 
             for req in getattr(func, "_reply_to", []):
                 self.reply_to(
-                    request=req, responses=[func],
+                    request=req,
+                    responses=[func],
                 )
 
     def _unhandled_command(self, command):

tests/test_commands.py

@@ -242,7 +242,11 @@ def test_command_param_binding():
 def test_command_optional_params():
     # Optional params values don't need a value
     short_version_rsp = c.SYS.Version.Rsp(
-        TransportRev=0, ProductId=1, MajorRel=2, MinorRel=3, MaintRel=4,
+        TransportRev=0,
+        ProductId=1,
+        MajorRel=2,
+        MinorRel=3,
+        MaintRel=4,
     )
 
     # Some can still be passed

tests/tools/test_energy_scan.py

@@ -50,7 +50,10 @@ async def response(request):
 
     znp_server.callback_for_response(
         c.ZDO.MgmtNWKUpdateReq.Req(
-            Dst=0x0000, DstAddrMode=t.AddrMode.NWK, NwkManagerAddr=0x0000, partial=True,
+            Dst=0x0000,
+            DstAddrMode=t.AddrMode.NWK,
+            NwkManagerAddr=0x0000,
+            partial=True,
         ),
         fake_scanner,
     )

tox.ini

@@ -27,7 +27,8 @@ deps = flake8
 commands = flake8
 
 [testenv:black]
-deps=black
+deps =
+    black==20.8.b1
 setenv =
     LC_ALL=C.UTF-8
     LANG=C.UTF-8

zigpy_znp/api.py

@@ -615,7 +615,9 @@ async def nvram_write(self, nv_id: nvids.BaseNvIds, value, *, create: bool = Fal
 
             await self.request(
                 c.SYS.OSALNVItemInit.Req(
-                    Id=nv_id, ItemLen=len(value), Value=t.ShortBytes(value[:244]),
+                    Id=nv_id,
+                    ItemLen=len(value),
+                    Value=t.ShortBytes(value[:244]),
                 ),
                 RspStatus=t.Status.NV_ITEM_UNINIT,
             )
@@ -641,7 +643,8 @@ async def nvram_read(self, nv_id: nvids.BaseNvIds) -> bytes:
         # XXX: Some NVIDs don't really exist and Z-Stack behaves strangely with them
         if nv_id == t.nvids.NwkNvIds.POLL_RATE_OLD16:
             read_rsp = await self.request(
-                c.SYS.OSALNVRead.Req(Id=nv_id, Offset=0), RspStatus=t.Status.SUCCESS,
+                c.SYS.OSALNVRead.Req(Id=nv_id, Offset=0),
+                RspStatus=t.Status.SUCCESS,
             )
 
             return read_rsp.Value

zigpy_znp/commands/app.py

@@ -10,7 +10,9 @@ class App(t.CommandsBase, subsystem=t.Subsystem.APP):
         0x00,
         req_schema=(
             t.Param(
-                "Endpoint", t.uint8_t, "Application endpoint of the outgoing message",
+                "Endpoint",
+                t.uint8_t,
+                "Application endpoint of the outgoing message",
             ),
             t.Param("DstAddr", t.NWK, "Destination address of the outgoing message"),
             t.Param(
@@ -31,7 +33,9 @@ class App(t.CommandsBase, subsystem=t.Subsystem.APP):
         0x01,
         req_schema=(
             t.Param(
-                "SrcEndpoint", t.uint8_t, "Source Endpoint of the user-defined command",
+                "SrcEndpoint",
+                t.uint8_t,
+                "Source Endpoint of the user-defined command",
             ),
             t.Param("CommandId", t.uint16_t, "Command Id of the user-defined command"),
             t.Param("Parameter1", t.uint16_t, "Parameter #1 of the command"),

zigpy_znp/commands/app_config.py

@@ -104,7 +104,9 @@ class AppConfig(t.CommandsBase, subsystem=t.Subsystem.APPConfig):
         0x03,
         req_schema=(
             t.Param(
-                "AllowRejoin", t.Bool, "whether or not the Trust center allows rejoins",
+                "AllowRejoin",
+                t.Bool,
+                "whether or not the Trust center allows rejoins",
             ),
         ),
         rsp_schema=t.STATUS_SCHEMA,

zigpy_znp/commands/mac.py

@@ -12,7 +12,9 @@ class MAC(t.CommandsBase, subsystem=t.Subsystem.MAC):
         0x01,
         req_schema=(
             t.Param(
-                "SetDefault", t.Bool, "TRUE - Set the MAC pib values to default values",
+                "SetDefault",
+                t.Bool,
+                "TRUE - Set the MAC pib values to default values",
             ),
         ),
         rsp_schema=t.STATUS_SCHEMA,
@@ -70,15 +72,19 @@ class MAC(t.CommandsBase, subsystem=t.Subsystem.MAC):
             t.Param("RealignKeySource", t.KeySource, "Key Source of this data frame"),
             # ToDo: Enum for for RealignSecurityLevel
             t.Param(
-                "RealignSecurityLevel", t.uint8_t, "Security level of this data frame",
+                "RealignSecurityLevel",
+                t.uint8_t,
+                "Security level of this data frame",
             ),
             # ToDo: Make this an enum
             t.Param("RealignKeyIdMode", t.uint8_t, "Key Id Mode of this frame"),
             t.Param("RealignKeyIndex", t.uint8_t, "Key index of this frame"),
             t.Param("BeaconKeySource", t.KeySource, "Key source of this data frame"),
             # ToDo: Make this an enum
             t.Param(
-                "BeaconSecurityLevel", t.uint8_t, "Security Level of this data frame",
+                "BeaconSecurityLevel",
+                t.uint8_t,
+                "Security Level of this data frame",
             ),
             t.Param("BeaconKeyIdMode", t.uint8_t, "Key Id Mode of this data frame"),
             t.Param("BeaconKeyIndex", t.uint8_t, "Key index of this data frame"),
@@ -270,7 +276,9 @@ class MAC(t.CommandsBase, subsystem=t.Subsystem.MAC):
             ),
             t.Param("NWK", t.NWK, "Short address of the associated device"),
             t.Param(
-                "AssociatedMember", t.Bool, "True is the orphan is a associated member",
+                "AssociatedMember",
+                t.Bool,
+                "True is the orphan is a associated member",
             ),
         ),
         rsp_schema=t.STATUS_SCHEMA,
@@ -323,7 +331,9 @@ class MAC(t.CommandsBase, subsystem=t.Subsystem.MAC):
         rsp_schema=(
             t.Param("Status", t.Status, "Status is either Success (0) or Failure (1)"),
             t.Param(
-                "PanId", t.PanId, "The PAN Id to use. This parameter is ignored if Pan",
+                "PanId",
+                t.PanId,
+                "The PAN Id to use. This parameter is ignored if Pan",
             ),
             t.Param("LogicalChannel", t.uint8_t, "The logical channel to use"),
             t.Param("ChannelPage", t.uint8_t, "The channel page to use"),
@@ -381,7 +391,9 @@ class MAC(t.CommandsBase, subsystem=t.Subsystem.MAC):
                 "Extended address of coordinator",
             ),
             t.Param(
-                "PanId", t.PanId, "The PAN Id to use. This parameter is ignored if Pan",
+                "PanId",
+                t.PanId,
+                "The PAN Id to use. This parameter is ignored if Pan",
             ),
             t.Param("Superframe", t.uint16_t, "Superframe specification"),
             t.Param("LogicalChannel", t.uint8_t, "The logical channel to use"),
@@ -396,7 +408,9 @@ class MAC(t.CommandsBase, subsystem=t.Subsystem.MAC):
             t.Param("KeyIndex", t.uint8_t, "Key index of this frame"),
             t.Param("PendingAddrSpec", t.uint8_t, "Pending address spec"),
             t.Param(
-                "AddressList", t.uint8_t, "List of address associate with the device",
+                "AddressList",
+                t.uint8_t,
+                "List of address associate with the device",
             ),
             t.Param("NSDU", t.ShortBytes, "Beacon payload"),
         ),

zigpy_znp/commands/sapi.py

@@ -72,7 +72,9 @@ class SAPI(t.CommandsBase, subsystem=t.Subsystem.SAPI):
             t.Param("Destination", t.NWK, "Short address of the destination"),
             t.Param("CommandId", t.uint16_t, "The command id to send with the message"),
             t.Param(
-                "Handle", t.uint8_t, "A handle used to Identify the send data request",
+                "Handle",
+                t.uint8_t,
+                "A handle used to Identify the send data request",
             ),
             t.Param("Ack", t.Bool, "True if requesting ACK from the destination"),
             t.Param(
@@ -163,7 +165,9 @@ class SAPI(t.CommandsBase, subsystem=t.Subsystem.SAPI):
         0x83,
         rsp_schema=(
             t.Param(
-                "Handle", t.uint8_t, "A handle used to Identify the send data request",
+                "Handle",
+                t.uint8_t,
+                "A handle used to Identify the send data request",
             ),
             t.Param("Status", t.Status, "Status is either Success (0) or Failure (1)"),
         ),

zigpy_znp/commands/sys.py

@@ -306,7 +306,9 @@ class SYS(t.CommandsBase, subsystem=t.Subsystem.SYS):
         0x10,
         req_schema=(
             t.Param(
-                "UTCTime", t.uint32_t, "Number of seconds since 00:00:00 on Jan 2000",
+                "UTCTime",
+                t.uint32_t,
+                "Number of seconds since 00:00:00 on Jan 2000",
             ),
             t.Param("Hour", t.uint8_t, "Hour of the day (0 -- 23)"),
             t.Param("Minute", t.uint8_t, "Minute of the hour (0 -- 59)"),
@@ -326,7 +328,9 @@ class SYS(t.CommandsBase, subsystem=t.Subsystem.SYS):
         req_schema=(),
         rsp_schema=(
             t.Param(
-                "UTCTime", t.uint32_t, "Number of seconds since 00:00:00 on Jan 2000",
+                "UTCTime",
+                t.uint32_t,
+                "Number of seconds since 00:00:00 on Jan 2000",
             ),
             t.Param("Hour", t.uint8_t, "Hour of the day (0 -- 23)"),
             t.Param("Minute", t.uint8_t, "Minute of the hour (0 -- 59)"),

zigpy_znp/commands/util.py

@@ -95,7 +95,9 @@ class Util(t.CommandsBase, subsystem=t.Subsystem.UTIL):
                 "Channels to be scanned when starting the device. Big endian!",
             ),
             t.Param(
-                "PanId", t.PanId, "The PAN Id to use. This parameter is ignored if Pan",
+                "PanId",
+                t.PanId,
+                "The PAN Id to use. This parameter is ignored if Pan",
             ),
             # ToDo: Make this an enum
             t.Param("SecurityLevel", t.uint8_t, "Security level of this data frame"),
@@ -233,7 +235,9 @@ class Util(t.CommandsBase, subsystem=t.Subsystem.UTIL):
         req_schema=(
             t.Param("AddrModeAddress", t.AddrModeAddress, "Address mode and address"),
             t.Param(
-                "PanId", t.PanId, "PAN Id of the device. Only use with a short address",
+                "PanId",
+                t.PanId,
+                "PAN Id of the device. Only use with a short address",
             ),
         ),
         rsp_schema=t.STATUS_SCHEMA,
@@ -246,7 +250,9 @@ class Util(t.CommandsBase, subsystem=t.Subsystem.UTIL):
         req_schema=(
             t.Param("AddrModeAddress", t.AddrModeAddress, "Address mode and address"),
             t.Param(
-                "PanId", t.PanId, "PAN Id of the device. Only use with a short address",
+                "PanId",
+                t.PanId,
+                "PAN Id of the device. Only use with a short address",
             ),
         ),
         rsp_schema=t.STATUS_SCHEMA,
@@ -259,7 +265,9 @@ class Util(t.CommandsBase, subsystem=t.Subsystem.UTIL):
         req_schema=(
             t.Param("AddrModeAddress", t.AddrModeAddress, "Address mode and address"),
             t.Param(
-                "PanId", t.PanId, "PAN Id of the device. Only use with a short address",
+                "PanId",
+                t.PanId,
+                "PAN Id of the device. Only use with a short address",
             ),
         ),
         rsp_schema=t.STATUS_SCHEMA,