From 69585f203273657d2ea6e55b4ace647f879f566c Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Mon, 23 Mar 2009 17:53:59 -0400 Subject: [PATCH] Remove some unneeded imports. Remove unused variable. --- wicd/backends/be-external.py | 10 --------- wicd/backends/be-ioctl.py | 1 - wicd/wicd-client.py | 2 -- wicd/wnettools.py | 40 ++++++++++++++++++------------------ 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/wicd/backends/be-external.py b/wicd/backends/be-external.py index daa8a08..13f9303 100644 --- a/wicd/backends/be-external.py +++ b/wicd/backends/be-external.py @@ -29,17 +29,10 @@ class WirelessInterface() -- Control a wireless network interface. # along with this program. If not, see . # -from wicd import misc -from wicd import wnettools from wicd.wnettools import GetDefaultGateway, GetWiredInterfaces, \ GetWirelessInterfaces, IsValidWpaSuppDriver, BaseWirelessInterface, \ 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" UPDATE_INTERVAL = 5 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. """ -RALINK_DRIVER = 'ralink legacy' - def NeedsExternalCalls(*args, **kargs): """ Return True, since this backend uses iwconfig/ifconfig. """ @@ -99,4 +90,3 @@ class WirelessInterface(Interface, BaseWirelessInterface): """ BaseWirelessInterface.__init__(self, iface, verbose, wpa_driver) Interface.__init__(self, iface, verbose) - diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py index 98c9aae..ee7f95b 100644 --- a/wicd/backends/be-ioctl.py +++ b/wicd/backends/be-ioctl.py @@ -31,7 +31,6 @@ class WirelessInterface() -- Control a wireless network interface. # from wicd import misc -from wicd import wnettools from wicd import wpath from wicd.wnettools import GetDefaultGateway, GetWiredInterfaces, \ GetWirelessInterfaces, IsValidWpaSuppDriver, BaseWirelessInterface, \ diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py index dc363f5..6c072a7 100755 --- a/wicd/wicd-client.py +++ b/wicd/wicd-client.py @@ -590,7 +590,6 @@ class TrayIcon(object): if event.button == 1: self.toggle_wicd_gui() elif event.button == 3: - self._menu_just_opened = True self.init_network_menu() 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): """ Opens the right click menu for the tray icon. """ - self._menu_just_opened = True self.init_network_menu() self.menu.popup(None, None, None, button, timestamp) diff --git a/wicd/wnettools.py b/wicd/wnettools.py index f085206..35cb932 100644 --- a/wicd/wnettools.py +++ b/wicd/wnettools.py @@ -41,30 +41,30 @@ import misc from misc import find_path # Regular expressions. -__re_mode = (re.I | re.M | re.S) -essid_pattern = re.compile('.*ESSID:"?(.*?)"?\s*\n', __re_mode) -ap_mac_pattern = re.compile('.*Address: (.*?)\n', __re_mode) -channel_pattern = re.compile('.*Channel:? ?(\d\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) -signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', __re_mode) -bitrates_pattern = re.compile('.*Bit Rates:(.*?)E', __re_mode) -mode_pattern = re.compile('.*Mode:(.*?)\n', __re_mode) -freq_pattern = re.compile('.*Frequency:(.*?)\n', __re_mode) -wep_pattern = re.compile('.*Encryption key:(.*?)\n', __re_mode) -altwpa_pattern = re.compile('(wpa_ie)', __re_mode) -wpa1_pattern = re.compile('(WPA Version 1)', __re_mode) -wpa2_pattern = re.compile('(WPA2)', __re_mode) +_re_mode = (re.I | re.M | re.S) +essid_pattern = re.compile('.*ESSID:"?(.*?)"?\s*\n', _re_mode) +ap_mac_pattern = re.compile('.*Address: (.*?)\n', _re_mode) +channel_pattern = re.compile('.*Channel:? ?(\d\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) +signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode) +bitrates_pattern = re.compile('.*Bit Rates:(.*?)E', _re_mode) +mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode) +freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode) +wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode) +altwpa_pattern = re.compile('(wpa_ie)', _re_mode) +wpa1_pattern = re.compile('(WPA Version 1)', _re_mode) +wpa2_pattern = re.compile('(WPA2)', _re_mode) #iwconfig-only regular expressions. -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) -bitrate_pattern = re.compile('.*Bit Rate=(.*?/s)', __re_mode) -opmode_pattern = re.compile('.*Mode:(.*?) ', __re_mode) -authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', __re_mode) +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) +bitrate_pattern = re.compile('.*Bit Rate=(.*?/s)', _re_mode) +opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode) +authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', _re_mode) # 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'