From 77e4207f8bbfde88c6a777ddc88f16d1a799acf0 Mon Sep 17 00:00:00 2001 From: Chalios Date: Tue, 10 Sep 2024 15:09:54 +0200 Subject: [PATCH] Adjust parsing regex for DeviceWifi to accomodate to multiple nmcli versions or locale adaptations. (Here just Mb/s instead of Mbit/s, so take both in account) --- nmcli/data/device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmcli/data/device.py b/nmcli/data/device.py index 1e2d1c5..2b3995f 100644 --- a/nmcli/data/device.py +++ b/nmcli/data/device.py @@ -64,7 +64,7 @@ def parse(cls, text: str) -> DeviceWifi: t = text.replace("\\:", "\uFFFE").replace( ":", "\uFFFF").replace("\uFFFE", ":") m = re.search( - r'^(\*|\s)\uFFFF(.*)\uFFFF(.*)\uFFFF(.*)\uFFFF(\d+)\uFFFF(\d+)\sMHz\uFFFF(\d+)\sMbit\/s\uFFFF(\d+)\uFFFF(.*)$', t) + r'^(\*|\s)\uFFFF(.*)\uFFFF(.*)\uFFFF(.*)\uFFFF(\d+)\uFFFF(\d+)\sMHz\uFFFF(\d+)\s(?:Mb|Mbit)\/s\uFFFF(\d+)\uFFFF(.*)$', t) if m: in_use, ssid, bssid, mode, chan, freq, rate, signal, security = m.groups() return DeviceWifi(in_use == '*', ssid, bssid, mode,