Oops, also swap FileType for ClosableFileType in backup tools

Author: puddly

zigpy_znp/tools/network_backup.py

@@ -4,14 +4,13 @@
 import json
 import asyncio
 import logging
-import argparse
 import datetime
 
 import zigpy_znp
 import zigpy_znp.types as t
 from zigpy_znp.api import ZNP
 from zigpy_znp.types.nvids import OsalNvIds
-from zigpy_znp.tools.common import setup_parser, validate_backup_json
+from zigpy_znp.tools.common import ClosableFileType, setup_parser, validate_backup_json
 from zigpy_znp.znp.security import read_devices, read_tc_frame_counter
 from zigpy_znp.zigbee.application import ControllerApplication
 
@@ -87,7 +86,7 @@ async def backup_network(znp: ZNP) -> t.JSONType:
 async def main(argv: list[str]) -> None:
     parser = setup_parser("Backup adapter network settings")
     parser.add_argument(
-        "--output", "-o", type=argparse.FileType("w"), help="Output file", default="-"
+        "--output", "-o", type=ClosableFileType("w"), help="Output file", default="-"
     )
     args = parser.parse_args(argv)
 

zigpy_znp/tools/network_restore.py

@@ -3,12 +3,11 @@
 import sys
 import json
 import asyncio
-import argparse
 
 import zigpy_znp.types as t
 import zigpy_znp.config as conf
 from zigpy_znp.types.nvids import OsalNvIds
-from zigpy_znp.tools.common import setup_parser, validate_backup_json
+from zigpy_znp.tools.common import ClosableFileType, setup_parser, validate_backup_json
 from zigpy_znp.znp.security import StoredDevice, write_devices, write_tc_frame_counter
 from zigpy_znp.zigbee.application import ControllerApplication
 
@@ -103,7 +102,7 @@ async def restore_network(
 async def main(argv: list[str]) -> None:
     parser = setup_parser("Restore adapter network settings")
     parser.add_argument(
-        "--input", "-i", type=argparse.FileType("r"), help="Input file", required=True
+        "--input", "-i", type=ClosableFileType("r"), help="Input file", required=True
     )
     parser.add_argument(
         "--counter-increment",