From e207cccdc5b193403f86a862a49749b278f03379 Mon Sep 17 00:00:00 2001 From: Thomas Vincent Date: Mon, 19 Dec 2022 22:23:10 -0500 Subject: [PATCH] fix copy/paste mess in regex --- jc/parsers/iwconfig.py | 6 ++++-- tests/fixtures/ubuntu-20.10/iwconfig.json | 11 +++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jc/parsers/iwconfig.py b/jc/parsers/iwconfig.py index c474c03a..9b0c13c9 100644 --- a/jc/parsers/iwconfig.py +++ b/jc/parsers/iwconfig.py @@ -97,14 +97,16 @@ def parse( "frequency_unit": None, "access_point": None, "bit_rate": None, + "bit_rate_unit": None, "tx_power": None, "tx_power_unit": None, "retry_short_limit": None, "rts_threshold": None, "fragment_threshold": None, - "poser_management": None, + "power_management": None, "link_quality": None, "signal_level": None, + "signal_level_unit": None, "rx_invalid_nwid": None, "rx_invalid_crypt": None, "rx_invalid_frag": None, @@ -125,7 +127,7 @@ def parse( re_rts_threshold = re.compile(r'RTS thr:(?P(off|on))') re_fragment_threshold = re.compile(r'Fragment thr:(?P(off|on))') re_power_management = re.compile(r'Power Management:(?P(off|on))') - re_link_quality = re.compile(r'Link Quality=(?P[0-9\/]+)') + re_link_quality = re.compile(r'Link Quality=(?P[0-9\/]+)') re_signal_level = re.compile(r'Signal level=(?P[-0-9]+)\s(?P[\w]+)') re_rx_invalid_nwid = re.compile(r'Rx invalid nwid:(?P[-0-9]+)') re_rx_invalid_crypt = re.compile(r'Rx invalid crypt:(?P[-0-9]+)') diff --git a/tests/fixtures/ubuntu-20.10/iwconfig.json b/tests/fixtures/ubuntu-20.10/iwconfig.json index e175a143..6f824ed2 100644 --- a/tests/fixtures/ubuntu-20.10/iwconfig.json +++ b/tests/fixtures/ubuntu-20.10/iwconfig.json @@ -8,22 +8,21 @@ "frequency_unit": "GHz", "access_point": "E6:63:DA:16:50:BF", "bit_rate": "6", + "bit_rate_unit": "Mb/s", "tx_power": "30", "tx_power_unit": "dBm", "retry_short_limit": "7", "rts_threshold": "off", "fragment_threshold": "off", - "poser_management": null, - "link_quality": null, + "power_management": "on", + "link_quality": "58/70", "signal_level": "-52", + "signal_level_unit": "dBm", "rx_invalid_nwid": "0", "rx_invalid_crypt": "0", "rx_invalid_frag": "0", "tx_excessive_retries": "0", "invalid_misc": "1766", - "missed_beacon": "0", - "bit_rate_unit": "Mb/s", - "power_management": "58/70", - "signal_level_unit": "dBm" + "missed_beacon": "0" } ] \ No newline at end of file