50d49
< iw_essid_pattern = re.compile('\s*SSID: ?(.*?)\n', _re_mode)
1360,1370c1359
<         cmd = ""
<         results = ""
< 
<         # NOTE: I got to deal with 140 entries in iwlist <if> scan...
<         def _iwlist(essid):
<             iwlist_cmd = 'iwlist ' + self.iface + ' scan'
<             iwlist_cmd += ' essid \'{0}\''.format(misc.to_unicode(essid))
<             if self.verbose:
<                 print iwlist_cmd
<             return misc.Run(iwlist_cmd)
<             
---
>         cmd = 'iwlist ' + self.iface + ' scan'
1375d1363
<         print essid
1377d1364
<             cmd = 'iwlist ' + self.iface + ' scan'
1379,1388c1366
<             cmd = cmd + ' essid \'{0}\''.format(essid)
<             results = misc.Run(cmd)
<         else:
<             cmd = 'iw ' + self.iface + ' scan'
<             results_iw = misc.Run(cmd)
<             m = set(re.findall(iw_essid_pattern, results_iw))
<             ##print "m> ", m
<             results = '\n'.join([_iwlist(essid) for essid in m if essid != ""])
<         
<         ##print "results>", results
---
>             cmd = cmd + ' essid ' + essid
1389a1368,1370
>         if self.verbose:
>             print cmd
>         results = misc.Run(cmd)
1408c1389
<             if 'SSID:' in cell:
---
>             if 'ESSID:' in cell:
1411d1391
<                 print "entry>", entry
1420d1399
<         ##print "access_points>", access_points
1435d1413
<         ##print "cell>", cell
1447d1424
<         ##print "ap>", ap
1451c1428
<             ##print 'hidden', cell
---
>             print 'hidden'
1475d1451
<         ##print "bssid>", ap['bssid'], "({0})".format(ap['essid'])
1478,1482c1454,1457
<         #ap['mode'] = misc.RunRegex(mode_pattern, cell)
<         #if ap['mode'] is None:
<         #    print 'Invalid network mode string, ignoring!'
<         #    return None
<         ap['mode'] = 'Master'
---
>         ap['mode'] = misc.RunRegex(mode_pattern, cell)
>         if ap['mode'] is None:
>             print 'Invalid network mode string, ignoring!'
>             return None
1502,1504d1476
<         # FIXME
<         ap['encryption_method'] = 'WPA2'
<         ap['encryption'] = True
1519d1490
<         ##print "return ap>", ap