gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 12:58:07 +01:00
Code Issues Projects Releases Wiki Activity

Remove some unneeded imports.

Browse Source 
Remove unused variable.
This commit is contained in:
Dan O'Reilly
2009-03-23 17:53:59 -04:00
parent ad09dea66e
commit 69585f2032
4 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wicd/backends/be-external.py
View File

@@ -29,17 +29,10 @@ class WirelessInterface() -- Control a wireless network interface.
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
from wicd import misc
from wicd import wnettools
from wicd.wnettools import GetDefaultGateway, GetWiredInterfaces, \ from wicd.wnettools import GetDefaultGateway, GetWiredInterfaces, \
GetWirelessInterfaces, IsValidWpaSuppDriver, BaseWirelessInterface, \ GetWirelessInterfaces, IsValidWpaSuppDriver, BaseWirelessInterface, \
BaseWiredInterface, BaseInterface BaseWiredInterface, BaseInterface
import re
import os
import os.path
# Regular expressions for wpa_cli output
auth_patten = re.compile('.*wpa_state=(.*?)\n', wnettools.__re_mode)
NAME = "external" NAME = "external"
UPDATE_INTERVAL = 5 UPDATE_INTERVAL = 5
DESCRIPTION = """External app (original) backend DESCRIPTION = """External app (original) backend
@@ -51,8 +44,6 @@ it doesn't require any third party libraries and may be
more stable for some set ups. more stable for some set ups.
""" """
RALINK_DRIVER = 'ralink legacy'
def NeedsExternalCalls(*args, **kargs): def NeedsExternalCalls(*args, **kargs):
""" Return True, since this backend uses iwconfig/ifconfig. """ """ Return True, since this backend uses iwconfig/ifconfig. """
@@ -99,4 +90,3 @@ class WirelessInterface(Interface, BaseWirelessInterface):
""" """
BaseWirelessInterface.__init__(self, iface, verbose, wpa_driver) BaseWirelessInterface.__init__(self, iface, verbose, wpa_driver)
Interface.__init__(self, iface, verbose) Interface.__init__(self, iface, verbose)

1
wicd/backends/be-ioctl.py
View File

@@ -31,7 +31,6 @@ class WirelessInterface() -- Control a wireless network interface.
# #
from wicd import misc from wicd import misc
from wicd import wnettools
from wicd import wpath from wicd import wpath
from wicd.wnettools import GetDefaultGateway, GetWiredInterfaces, \ from wicd.wnettools import GetDefaultGateway, GetWiredInterfaces, \
GetWirelessInterfaces, IsValidWpaSuppDriver, BaseWirelessInterface, \ GetWirelessInterfaces, IsValidWpaSuppDriver, BaseWirelessInterface, \

2
wicd/wicd-client.py
View File

@@ -590,7 +590,6 @@ class TrayIcon(object):
if event.button == 1: if event.button == 1:
self.toggle_wicd_gui() self.toggle_wicd_gui()
elif event.button == 3: elif event.button == 3:
self._menu_just_opened = True
self.init_network_menu() self.init_network_menu()
self.menu.popup(None, None, None, event.button, event.time) self.menu.popup(None, None, None, event.button, event.time)
@@ -628,7 +627,6 @@ class TrayIcon(object):
def on_popup_menu(self, status, button, timestamp): def on_popup_menu(self, status, button, timestamp):
""" Opens the right click menu for the tray icon. """ """ Opens the right click menu for the tray icon. """
self._menu_just_opened = True
self.init_network_menu() self.init_network_menu()
self.menu.popup(None, None, None, button, timestamp) self.menu.popup(None, None, None, button, timestamp)

40
wicd/wnettools.py
View File

@@ -41,30 +41,30 @@ import misc
from misc import find_path from misc import find_path
# Regular expressions. # Regular expressions.
__re_mode = (re.I | re.M | re.S) _re_mode = (re.I | re.M | re.S)
essid_pattern = re.compile('.*ESSID:"?(.*?)"?\s*\n', __re_mode) essid_pattern = re.compile('.*ESSID:"?(.*?)"?\s*\n', _re_mode)
ap_mac_pattern = re.compile('.*Address: (.*?)\n', __re_mode) ap_mac_pattern = re.compile('.*Address: (.*?)\n', _re_mode)
channel_pattern = re.compile('.*Channel:? ?(\d\d?)', __re_mode) 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('.*Bit Rates:(.*?)E', _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)
altwpa_pattern = re.compile('(wpa_ie)', __re_mode) altwpa_pattern = re.compile('(wpa_ie)', _re_mode)
wpa1_pattern = re.compile('(WPA Version 1)', __re_mode) wpa1_pattern = re.compile('(WPA Version 1)', _re_mode)
wpa2_pattern = re.compile('(WPA2)', __re_mode) wpa2_pattern = re.compile('(WPA2)', _re_mode)
#iwconfig-only regular expressions. #iwconfig-only regular expressions.
ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)',re.S) ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S)
bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', __re_mode) bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode)
bitrate_pattern = re.compile('.*Bit Rate=(.*?/s)', __re_mode) bitrate_pattern = re.compile('.*Bit Rate=(.*?/s)', _re_mode)
opmode_pattern = re.compile('.*Mode:(.*?) ', __re_mode) opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode)
authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', __re_mode) authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', _re_mode)
# Regular expressions for wpa_cli output # Regular expressions for wpa_cli output
auth_pattern = re.compile('.*wpa_state=(.*?)\n', __re_mode) auth_pattern = re.compile('.*wpa_state=(.*?)\n', _re_mode)
RALINK_DRIVER = 'ralink legacy' RALINK_DRIVER = 'ralink legacy'