gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-10 19:45:50 +01:00
Code Issues Projects Releases Wiki Activity

Make bitrates regex work when it's the last entry in a cell.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-05-09 20:53:49 -04:00
parent d192f64182
commit 8dc997548e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wicd/wnettools.py
View File

@@ -48,7 +48,7 @@ channel_pattern = re.compile('.*Channel:? ?(\d\d?)', _re_mode)
strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode)
altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode)
signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode) signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode)
bitrates_pattern = re.compile('.*Bit Rates:(.*?)E', _re_mode) bitrates_pattern = re.compile('(\d+\s+\S+/s)', _re_mode)
mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode) mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode)
freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode) freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode)
wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode) wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode)
@@ -1114,9 +1114,9 @@ class BaseWirelessInterface(BaseInterface):
ap['channel'] = self._FreqToChannel(freq) ap['channel'] = self._FreqToChannel(freq)
# Bit Rate # Bit Rate
ap['bitrates'] = misc.RunRegex(bitrates_pattern, cell).split('\n') ap['bitrates'] = misc.RunRegex(bitrates_pattern,
ap['bitrates'] = '; '.join(m.strip() for m in ap['bitrates']).rstrip('; ') cell.split("Bit Rates")[-1])
# BSSID # BSSID
ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell) ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell)