tplinkrouterc6u 4.2.0__tar.gz → 4.2.2__tar.gz

{tplinkrouterc6u-4.2.0 → tplinkrouterc6u-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tplinkrouterc6u
-Version: 4.2.0
+Version: 4.2.2
 Summary: TP-Link Router API
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -228,12 +229,11 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX12 v1.0
 - Archer AX20 v1.0
 - Archer AX20 v3.0
-- Archer AX21 v1.20
+- Archer AX21 (v1.20, v3.0)
 - Archer AX23 v1.0
 - Archer AX50 v1.0
 - Archer AX53 v2
-- Archer AX55 v1.0
-- Archer AX55 V1.60
+- Archer AX55 (v1.0, V1.60, v4.0)
 - Archer AX72 V1
 - Archer AX73 V1
 - Archer AX75 V1
@@ -242,31 +242,35 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE800 v1.0
 - Archer BE805 v1.0
-- Archer C1200 v2.0 (You need to use [web encrypted password](#encrypted_pass))
+- Archer C1200 (v1.0, v2.0) (You need to use [web encrypted password](#encrypted_pass))
 - Archer C2300 v1.0 (You need to use [web encrypted password](#encrypted_pass))
-- Archer C6 v2.0
-- Archer C6 v3.0
+- Archer C6 (v2.0, v3.0)
 - Archer C6U v1.0
-- Archer C7 v5.0
-- Archer MR200 v5
-- Archer MR200 v5.3
-- Archer MR600 v1
-- Archer MR600 v3
+- Archer C7 (v4.0, v5.0)
+- Archer C5400X V1
+- Archer GX90 v1.0
+- Archer MR200 (v5, v5.3)
+- Archer MR600 (v1, v3)
+- Archer VR2100v v1
 - Archer VR900v
 - Deco M4 2.0
 - Deco M4R 2.0
-- Deco M5
+- Deco M5 v3
 - Deco M9 Pro
+- Deco M9 Plus 1.0
 - Deco P7
-- Deco X20 
-- Deco X60 
+- Deco X20
+- Deco X50 v1.3
+- Deco X60 V3
 - Deco X90
-- Deco XE75 2.0
-- TL-WA3001 v1.0
+- Deco XE75 (v1.0, v2.0)
+- TD-W9960 (v1, V1.20)
+- TL-MR100 v2.0
 - TL-MR105
-- TL-MR6400 v5
-- TL-MR6400 v5.3
+- TL-MR6400 (v5, v5.3)
+- TL-WA3001 v1.0
 
 ### Not fully tested Hardware Versions
 - AD7200 V2
@@ -282,11 +286,9 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer C900 V1
 - Archer C1200 V3
 - Archer C1900 V2
-- Archer C2300 (V1, V2)
+- Archer C2300 V2
 - Archer C4000 (V2 and V3)
 - Archer C5400 V2
-- Archer C5400X V1
-- TD-W9960 v1
 - TL-WR1043N V5
 
 Please let me know if you have tested integration with one of this or other model. Open an issue with info about router's model, hardware and firmware versions.

{tplinkrouterc6u-4.2.0 → tplinkrouterc6u-4.2.2}/README.md

@@ -207,12 +207,11 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX12 v1.0
 - Archer AX20 v1.0
 - Archer AX20 v3.0
-- Archer AX21 v1.20
+- Archer AX21 (v1.20, v3.0)
 - Archer AX23 v1.0
 - Archer AX50 v1.0
 - Archer AX53 v2
-- Archer AX55 v1.0
-- Archer AX55 V1.60
+- Archer AX55 (v1.0, V1.60, v4.0)
 - Archer AX72 V1
 - Archer AX73 V1
 - Archer AX75 V1
@@ -221,31 +220,35 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer AX3000 V1
 - Archer AX6000 V1
 - Archer AX11000 V1
+- Archer BE800 v1.0
 - Archer BE805 v1.0
-- Archer C1200 v2.0 (You need to use [web encrypted password](#encrypted_pass))
+- Archer C1200 (v1.0, v2.0) (You need to use [web encrypted password](#encrypted_pass))
 - Archer C2300 v1.0 (You need to use [web encrypted password](#encrypted_pass))
-- Archer C6 v2.0
-- Archer C6 v3.0
+- Archer C6 (v2.0, v3.0)
 - Archer C6U v1.0
-- Archer C7 v5.0
-- Archer MR200 v5
-- Archer MR200 v5.3
-- Archer MR600 v1
-- Archer MR600 v3
+- Archer C7 (v4.0, v5.0)
+- Archer C5400X V1
+- Archer GX90 v1.0
+- Archer MR200 (v5, v5.3)
+- Archer MR600 (v1, v3)
+- Archer VR2100v v1
 - Archer VR900v
 - Deco M4 2.0
 - Deco M4R 2.0
-- Deco M5
+- Deco M5 v3
 - Deco M9 Pro
+- Deco M9 Plus 1.0
 - Deco P7
-- Deco X20 
-- Deco X60 
+- Deco X20
+- Deco X50 v1.3
+- Deco X60 V3
 - Deco X90
-- Deco XE75 2.0
-- TL-WA3001 v1.0
+- Deco XE75 (v1.0, v2.0)
+- TD-W9960 (v1, V1.20)
+- TL-MR100 v2.0
 - TL-MR105
-- TL-MR6400 v5
-- TL-MR6400 v5.3
+- TL-MR6400 (v5, v5.3)
+- TL-WA3001 v1.0
 
 ### Not fully tested Hardware Versions
 - AD7200 V2
@@ -261,11 +264,9 @@ or you have TP-link C1200 V2 or similar router you need to get web encrypted pas
 - Archer C900 V1
 - Archer C1200 V3
 - Archer C1900 V2
-- Archer C2300 (V1, V2)
+- Archer C2300 V2
 - Archer C4000 (V2 and V3)
 - Archer C5400 V2
-- Archer C5400X V1
-- TD-W9960 v1
 - TL-WR1043N V5
 
 Please let me know if you have tested integration with one of this or other model. Open an issue with info about router's model, hardware and firmware versions.

{tplinkrouterc6u-4.2.0 → tplinkrouterc6u-4.2.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tplinkrouterc6u",
-    version="4.2.0",
+    version="4.2.2",
     author="Alex Erohin",
     author_email="alexanderErohin@yandex.ru",
     description="TP-Link Router API",
@@ -20,8 +20,9 @@ setuptools.setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
     install_requires=['requests', 'pycryptodome', 'macaddress'],
     python_requires='>=3.10',
-)
+)

{tplinkrouterc6u-4.2.0 → tplinkrouterc6u-4.2.2}/test/test_client.py

@@ -1,7 +1,7 @@
-import unittest
-import macaddress
-import ipaddress
-import json
+from unittest import main, TestCase
+from macaddress import EUI48
+from ipaddress import IPv4Address
+from json import loads
 from tplinkrouterc6u import (
     TplinkRouter,
     Connection,
@@ -11,7 +11,7 @@ from tplinkrouterc6u import (
 )
 
 
-class TestTPLinkClient(unittest.TestCase):
+class TestTPLinkClient(TestCase):
     def test_get_status(self) -> None:
         response_status = '''
 {
@@ -53,6 +53,12 @@ class TestTPLinkClient(unittest.TestCase):
                 "macaddr": "06:82:9d:2b:8f:c6",
                 "ipaddr": "192.168.1.186",
                 "hostname": "UNKNOWN"
+            },
+            {
+                "wire_type": "2.4G",
+                "macaddr": "06:55:9d:2b:8f:a7",
+                "ipaddr": "Unknown",
+                "hostname": "Unknown"
             }
         ],
         "guest_5g_psk_key": "",
@@ -206,9 +212,9 @@ class TestTPLinkClient(unittest.TestCase):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/status?form=all&operation=read':
-                    return json.loads(response_status)['data']
+                    return loads(response_status)['data']
                 elif path == 'admin/wireless?form=statistics':
-                    return json.loads(response_stats)['data']
+                    return loads(response_stats)['data']
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
@@ -216,18 +222,18 @@ class TestTPLinkClient(unittest.TestCase):
 
         self.assertIsInstance(status, Status)
         self.assertEqual(status.wan_macaddr, 'D6-0B-40-57-DA-60')
-        self.assertIsInstance(status.wan_macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.wan_macaddress, EUI48)
         self.assertEqual(status.lan_macaddr, '06-E6-97-9E-23-F5')
-        self.assertIsInstance(status.lan_macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.lan_macaddress, EUI48)
         self.assertEqual(status.wan_ipv4_addr, '192.168.1.100')
-        self.assertIsInstance(status.lan_ipv4_address, ipaddress.IPv4Address)
+        self.assertIsInstance(status.lan_ipv4_address, IPv4Address)
         self.assertEqual(status.lan_ipv4_addr, '192.168.1.100')
         self.assertEqual(status.wan_ipv4_gateway, '192.168.1.254')
-        self.assertIsInstance(status.wan_ipv4_address, ipaddress.IPv4Address)
+        self.assertIsInstance(status.wan_ipv4_address, IPv4Address)
         self.assertEqual(status.wired_total, 2)
-        self.assertEqual(status.wifi_clients_total, 2)
+        self.assertEqual(status.wifi_clients_total, 3)
         self.assertEqual(status.guest_clients_total, 0)
-        self.assertEqual(status.clients_total, 4)
+        self.assertEqual(status.clients_total, 5)
         self.assertEqual(status.iot_clients_total, None)
         self.assertEqual(status.guest_2g_enable, False)
         self.assertEqual(status.guest_5g_enable, False)
@@ -238,22 +244,22 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertEqual(status.wan_ipv4_uptime, None)
         self.assertEqual(status.mem_usage, 0.43)
         self.assertEqual(status.cpu_usage, 0.28)
-        self.assertEqual(len(status.devices), 4)
+        self.assertEqual(len(status.devices), 5)
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[0].type, Connection.WIRED)
         self.assertEqual(status.devices[0].macaddr, '3D-24-25-24-30-79')
-        self.assertIsInstance(status.devices[0].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[0].macaddress, EUI48)
         self.assertEqual(status.devices[0].ipaddr, '192.168.1.228')
-        self.assertIsInstance(status.devices[0].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[0].ipaddress, IPv4Address)
         self.assertEqual(status.devices[0].hostname, 'SERVER')
         self.assertEqual(status.devices[0].packets_sent, None)
         self.assertEqual(status.devices[0].packets_received, None)
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[1].type, Connection.WIRED)
         self.assertEqual(status.devices[1].macaddr, 'AC-04-D6-25-2A-96')
-        self.assertIsInstance(status.devices[1].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[1].macaddress, EUI48)
         self.assertEqual(status.devices[1].ipaddr, '192.168.1.254')
-        self.assertIsInstance(status.devices[1].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[1].ipaddress, IPv4Address)
         self.assertEqual(status.devices[1].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[1].packets_sent, None)
         self.assertEqual(status.devices[1].packets_received, None)
@@ -265,12 +271,19 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertEqual(status.devices[2].packets_sent, 450333)
         self.assertEqual(status.devices[2].packets_received, 4867482)
         self.assertIsInstance(status.devices[3], Device)
-        self.assertEqual(status.devices[3].type, Connection.HOST_5G)
-        self.assertEqual(status.devices[3].macaddr, '1F-7A-BD-F7-20-0D')
+        self.assertEqual(status.devices[3].type, Connection.HOST_2G)
+        self.assertEqual(status.devices[3].macaddr, '06-55-9D-2B-8F-A7')
         self.assertEqual(status.devices[3].ipaddr, '0.0.0.0')
-        self.assertEqual(status.devices[3].hostname, '')
-        self.assertEqual(status.devices[3].packets_sent, 134815)
-        self.assertEqual(status.devices[3].packets_received, 2953078)
+        self.assertEqual(status.devices[3].hostname, 'Unknown')
+        self.assertEqual(status.devices[3].packets_sent, None)
+        self.assertEqual(status.devices[3].packets_received, None)
+        self.assertIsInstance(status.devices[4], Device)
+        self.assertEqual(status.devices[4].type, Connection.HOST_5G)
+        self.assertEqual(status.devices[4].macaddr, '1F-7A-BD-F7-20-0D')
+        self.assertEqual(status.devices[4].ipaddr, '0.0.0.0')
+        self.assertEqual(status.devices[4].hostname, '')
+        self.assertEqual(status.devices[4].packets_sent, 134815)
+        self.assertEqual(status.devices[4].packets_received, 2953078)
 
     def test_get_status_ax_55(self) -> None:
         response_status = '''
@@ -321,9 +334,9 @@ class TestTPLinkClient(unittest.TestCase):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/status?form=all&operation=read':
-                    return json.loads(response_status)['data']
+                    return loads(response_status)['data']
                 elif path == 'admin/wireless?form=statistics':
-                    return json.loads(response_stats)['data']
+                    return loads(response_stats)['data']
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
@@ -332,7 +345,7 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertIsInstance(status, Status)
         self.assertEqual(status.wan_macaddr, None)
         self.assertEqual(status.lan_macaddr, '06-E6-97-9E-23-F5')
-        self.assertIsInstance(status.lan_macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.lan_macaddress, EUI48)
         self.assertEqual(status.wan_ipv4_addr, None)
         self.assertEqual(status.lan_ipv4_addr, None)
         self.assertEqual(status.wan_ipv4_gateway, None)
@@ -357,27 +370,27 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[0].type, Connection.WIRED)
         self.assertEqual(status.devices[0].macaddr, '3D-24-25-24-30-79')
-        self.assertIsInstance(status.devices[0].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[0].macaddress, EUI48)
         self.assertEqual(status.devices[0].ipaddr, '192.168.1.228')
-        self.assertIsInstance(status.devices[0].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[0].ipaddress, IPv4Address)
         self.assertEqual(status.devices[0].hostname, 'SERVER')
         self.assertEqual(status.devices[0].packets_sent, None)
         self.assertEqual(status.devices[0].packets_received, None)
         self.assertIsInstance(status.devices[1], Device)
         self.assertEqual(status.devices[1].type, Connection.WIRED)
         self.assertEqual(status.devices[1].macaddr, 'AC-04-D6-25-2A-96')
-        self.assertIsInstance(status.devices[1].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[1].macaddress, EUI48)
         self.assertEqual(status.devices[1].ipaddr, '192.168.1.254')
-        self.assertIsInstance(status.devices[1].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[1].ipaddress, IPv4Address)
         self.assertEqual(status.devices[1].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[1].packets_sent, None)
         self.assertEqual(status.devices[1].packets_received, None)
         self.assertIsInstance(status.devices[2], Device)
         self.assertEqual(status.devices[2].type, Connection.HOST_2G)
         self.assertEqual(status.devices[2].macaddr, '06-82-9D-2B-8F-C6')
-        self.assertIsInstance(status.devices[2].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[2].macaddress, EUI48)
         self.assertEqual(status.devices[2].ipaddr, '192.168.1.186')
-        self.assertIsInstance(status.devices[2].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[2].ipaddress, IPv4Address)
         self.assertEqual(status.devices[2].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[2].packets_sent, None)
         self.assertEqual(status.devices[2].packets_received, None)
@@ -425,11 +438,14 @@ class TestTPLinkClient(unittest.TestCase):
         response_game_accelerator = '''
   {
       "data": [
-          {"mac": "06:82:9d:2b:8f:c6", "deviceTag":"2.4G", "isGuest":false, "ip":"192.168.1.186", "deviceName":"name1",
-          "uploadSpeed":12, "downloadSpeed":77},
-          {"mac": "fb:90:b8:2a:8a:b1", "deviceTag":"iot_2.4G", "isGuest":false, "ip":"192.168.1.187", "deviceName":"name2"},
-          {"mac": "54:b3:a2:f7:be:ea", "deviceTag":"iot_5G", "isGuest":false, "ip":"192.168.1.188", "deviceName":"name3"},
-          {"mac": "3c:ae:e1:83:94:9d", "deviceTag":"iot_6G", "isGuest":false, "ip":"192.168.1.189", "deviceName":"name4"}
+          {"mac": "06:82:9d:2b:8f:c6", "deviceTag":"2.4G", "isGuest":false, "ip":"192.168.1.186",
+          "deviceName":"name1", "uploadSpeed":12, "downloadSpeed":77},
+          {"mac": "fb:90:b8:2a:8a:b1", "deviceTag":"iot_2.4G", "isGuest":false, "ip":"192.168.1.187",
+          "deviceName":"name2"},
+          {"mac": "54:b3:a2:f7:be:ea", "deviceTag":"iot_5G", "isGuest":false, "ip":"192.168.1.188",
+          "deviceName":"name3"},
+          {"mac": "3c:ae:e1:83:94:9d", "deviceTag":"iot_6G", "isGuest":false, "ip":"192.168.1.189",
+          "deviceName":"name4"}
       ],
       "timeout": false,
       "success": true
@@ -463,11 +479,11 @@ class TestTPLinkClient(unittest.TestCase):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/status?form=all&operation=read':
-                    return json.loads(response_status)['data']
+                    return loads(response_status)['data']
                 elif path == 'admin/smart_network?form=game_accelerator':
-                    return json.loads(response_game_accelerator)['data']
+                    return loads(response_game_accelerator)['data']
                 elif path == 'admin/wireless?form=statistics':
-                    return json.loads(response_stats)['data']
+                    return loads(response_stats)['data']
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
@@ -476,7 +492,7 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertIsInstance(status, Status)
         self.assertEqual(status.wan_macaddr, None)
         self.assertEqual(status.lan_macaddr, '06-E6-97-9E-23-F5')
-        self.assertIsInstance(status.lan_macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.lan_macaddress, EUI48)
         self.assertEqual(status.wan_ipv4_addr, None)
         self.assertEqual(status.lan_ipv4_addr, None)
         self.assertEqual(status.wan_ipv4_gateway, None)
@@ -501,27 +517,27 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertIsInstance(status.devices[0], Device)
         self.assertEqual(status.devices[0].type, Connection.WIRED)
         self.assertEqual(status.devices[0].macaddr, '3D-24-25-24-30-79')
-        self.assertIsInstance(status.devices[0].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[0].macaddress, EUI48)
         self.assertEqual(status.devices[0].ipaddr, '192.168.1.228')
-        self.assertIsInstance(status.devices[0].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[0].ipaddress, IPv4Address)
         self.assertEqual(status.devices[0].hostname, 'SERVER')
         self.assertEqual(status.devices[0].packets_sent, None)
         self.assertEqual(status.devices[0].packets_received, None)
         self.assertIsInstance(status.devices[1], Device)
         self.assertEqual(status.devices[1].type, Connection.WIRED)
         self.assertEqual(status.devices[1].macaddr, 'AC-04-D6-25-2A-96')
-        self.assertIsInstance(status.devices[1].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[1].macaddress, EUI48)
         self.assertEqual(status.devices[1].ipaddr, '192.168.1.254')
-        self.assertIsInstance(status.devices[1].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[1].ipaddress, IPv4Address)
         self.assertEqual(status.devices[1].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[1].packets_sent, None)
         self.assertEqual(status.devices[1].packets_received, None)
         self.assertIsInstance(status.devices[2], Device)
         self.assertEqual(status.devices[2].type, Connection.HOST_2G)
         self.assertEqual(status.devices[2].macaddr, '06-82-9D-2B-8F-C6')
-        self.assertIsInstance(status.devices[2].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[2].macaddress, EUI48)
         self.assertEqual(status.devices[2].ipaddr, '192.168.1.186')
-        self.assertIsInstance(status.devices[2].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[2].ipaddress, IPv4Address)
         self.assertEqual(status.devices[2].hostname, 'UNKNOWN')
         self.assertEqual(status.devices[2].packets_sent, 450333)
         self.assertEqual(status.devices[2].packets_received, 4867482)
@@ -530,36 +546,36 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertIsInstance(status.devices[3], Device)
         self.assertEqual(status.devices[3].type, Connection.IOT_2G)
         self.assertEqual(status.devices[3].macaddr, 'FB-90-B8-2A-8A-B1')
-        self.assertIsInstance(status.devices[3].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[3].macaddress, EUI48)
         self.assertEqual(status.devices[3].ipaddr, '192.168.1.187')
-        self.assertIsInstance(status.devices[3].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[3].ipaddress, IPv4Address)
         self.assertEqual(status.devices[3].hostname, 'name2')
         self.assertEqual(status.devices[3].packets_sent, None)
         self.assertEqual(status.devices[3].packets_received, None)
         self.assertIsInstance(status.devices[4], Device)
         self.assertEqual(status.devices[4].type, Connection.IOT_5G)
         self.assertEqual(status.devices[4].macaddr, '54-B3-A2-F7-BE-EA')
-        self.assertIsInstance(status.devices[4].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[4].macaddress, EUI48)
         self.assertEqual(status.devices[4].ipaddr, '192.168.1.188')
-        self.assertIsInstance(status.devices[4].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[4].ipaddress, IPv4Address)
         self.assertEqual(status.devices[4].hostname, 'name3')
         self.assertEqual(status.devices[4].packets_sent, None)
         self.assertEqual(status.devices[4].packets_received, None)
         self.assertIsInstance(status.devices[5], Device)
         self.assertEqual(status.devices[5].type, Connection.IOT_6G)
         self.assertEqual(status.devices[5].macaddr, '3C-AE-E1-83-94-9D')
-        self.assertIsInstance(status.devices[5].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[5].macaddress, EUI48)
         self.assertEqual(status.devices[5].ipaddr, '192.168.1.189')
-        self.assertIsInstance(status.devices[5].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[5].ipaddress, IPv4Address)
         self.assertEqual(status.devices[5].hostname, 'name4')
         self.assertEqual(status.devices[5].packets_sent, None)
         self.assertEqual(status.devices[5].packets_received, None)
         self.assertIsInstance(status.devices[6], Device)
         self.assertEqual(status.devices[6].type, Connection.HOST_5G)
         self.assertEqual(status.devices[6].macaddr, '1F-7A-BD-F7-20-0D')
-        self.assertIsInstance(status.devices[6].macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.devices[6].macaddress, EUI48)
         self.assertEqual(status.devices[6].ipaddr, '0.0.0.0')
-        self.assertIsInstance(status.devices[6].ipaddress, ipaddress.IPv4Address)
+        self.assertIsInstance(status.devices[6].ipaddress, IPv4Address)
         self.assertEqual(status.devices[6].hostname, '')
         self.assertEqual(status.devices[6].packets_sent, 134815)
         self.assertEqual(status.devices[6].packets_received, 2953078)
@@ -596,11 +612,11 @@ class TestTPLinkClient(unittest.TestCase):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/status?form=all&operation=read':
-                    return json.loads(response_status)['data']
+                    return loads(response_status)['data']
                 elif path == 'admin/status?form=perf&operation=read':
-                    return json.loads(perf_stats)['data']
+                    return loads(perf_stats)['data']
                 elif path == 'admin/wireless?form=statistics':
-                    return json.loads(response_stats)['data']
+                    return loads(response_stats)['data']
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
@@ -609,7 +625,7 @@ class TestTPLinkClient(unittest.TestCase):
         self.assertIsInstance(status, Status)
         self.assertEqual(status.wan_macaddr, None)
         self.assertEqual(status.lan_macaddr, '06-E6-97-9E-23-F5')
-        self.assertIsInstance(status.lan_macaddress, macaddress.EUI48)
+        self.assertIsInstance(status.lan_macaddress, EUI48)
         self.assertEqual(status.wan_ipv4_addr, None)
         self.assertEqual(status.lan_ipv4_addr, None)
         self.assertEqual(status.wan_ipv4_gateway, None)
@@ -679,4 +695,4 @@ class TestTPLinkClient(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    main()

{tplinkrouterc6u-4.2.0 → tplinkrouterc6u-4.2.2}/test/test_client_c1200.py

@@ -1,12 +1,13 @@
-import unittest
-import json
+from unittest import main, TestCase
+from json import loads
 from tplinkrouterc6u import (
     TplinkC1200Router,
     Connection,
     ClientException
 )
 
-class TestTPLinkC1200Client(unittest.TestCase):
+
+class TestTPLinkC1200Client(TestCase):
 
     def test_set_led_on(self) -> None:
 
@@ -30,18 +31,18 @@ class TestTPLinkC1200Client(unittest.TestCase):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/ledgeneral?form=setting&operation=read':
-                    return json.loads(response_led_general_read)
+                    return loads(response_led_general_read)
                 if path == 'admin/ledgeneral?form=setting&operation=write':
                     self.captured_path = path
-                    return json.loads(response_led_general_write)
+                    return loads(response_led_general_write)
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
-        
+
         client.set_led(True)
 
         expected_path = "admin/ledgeneral?form=setting&operation=write"
-        
+
         self.assertEqual(client.captured_path, expected_path)
 
     def test_set_led_off(self) -> None:
@@ -66,10 +67,10 @@ class TestTPLinkC1200Client(unittest.TestCase):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/ledgeneral?form=setting&operation=read':
-                    return json.loads(response_led_general_read)
+                    return loads(response_led_general_read)
                 elif path == 'admin/ledgeneral?form=setting&operation=write':
                     self.captured_path = path
-                    return json.loads(response_led_general_write)
+                    return loads(response_led_general_write)
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
@@ -77,7 +78,7 @@ class TestTPLinkC1200Client(unittest.TestCase):
         client.set_led(False)
 
         expected_path = "admin/ledgeneral?form=setting&operation=write"
-        
+
         self.assertEqual(client.captured_path, expected_path)
 
     def test_led_status(self) -> None:
@@ -89,12 +90,12 @@ class TestTPLinkC1200Client(unittest.TestCase):
             "ledpm_support": "yes"
         }
         '''
-        
+
         class TPLinkRouterTest(TplinkC1200Router):
             def request(self, path: str, data: str,
                         ignore_response: bool = False, ignore_errors: bool = False) -> dict | None:
                 if path == 'admin/ledgeneral?form=setting&operation=read':
-                    return json.loads(response_led_general_read)
+                    return loads(response_led_general_read)
                 raise ClientException()
 
         client = TPLinkRouterTest('', '')
@@ -102,7 +103,6 @@ class TestTPLinkC1200Client(unittest.TestCase):
         led_status = client.get_led()
         self.assertTrue(led_status)
 
-
     def test_set_wifi(self) -> None:
 
         class TPLinkRouterTest(TplinkC1200Router):
@@ -128,14 +128,15 @@ class TestTPLinkC1200Client(unittest.TestCase):
             txpower="20",
             disabled_all="no"
         )
-        
+
         expected_data = ("operation=write&enable=on&ssid=TestSSID&hidden=no&encryption=WPA3-PSK&"
                          "psk_version=2&psk_cipher=AES&psk_key=testkey123&hwmode=11ac&"
                          "htmode=VHT20&channel=36&txpower=20&disabled_all=no")
         expected_path = f"admin/wireless?form=wireless_5g&{expected_data}"
-        
+
         self.assertEqual(client.captured_path, expected_path)
         self.assertEqual(client.captured_data, expected_data)
 
+
 if __name__ == '__main__':
-    unittest.main()
+    main()