Changed all tabs to 4 spaces for python style
This commit is contained in:
+92
-92
@@ -22,111 +22,111 @@ import gtk
|
||||
import hippo
|
||||
|
||||
class Bubble(hippo.CanvasBox, hippo.CanvasItem):
|
||||
__gtype_name__ = 'NetworkBubble'
|
||||
__gtype_name__ = 'NetworkBubble'
|
||||
|
||||
__gproperties__ = {
|
||||
'fill-color': (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
'stroke-color': (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
'progress-color': (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
'percent' : (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
}
|
||||
__gproperties__ = {
|
||||
'fill-color': (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
'stroke-color': (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
'progress-color': (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
'percent' : (object, None, None,
|
||||
gobject.PARAM_READWRITE),
|
||||
}
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self._stroke_color = 0xFFFFFFFF
|
||||
self._fill_color = 0xFFFFFFFF
|
||||
self._progress_color = 0x000000FF
|
||||
self._percent = 0
|
||||
self._radius = 8
|
||||
def __init__(self, **kwargs):
|
||||
self._stroke_color = 0xFFFFFFFF
|
||||
self._fill_color = 0xFFFFFFFF
|
||||
self._progress_color = 0x000000FF
|
||||
self._percent = 0
|
||||
self._radius = 8
|
||||
|
||||
hippo.CanvasBox.__init__(self, **kwargs)
|
||||
hippo.CanvasBox.__init__(self, **kwargs)
|
||||
|
||||
def do_set_property(self, pspec, value):
|
||||
if pspec.name == 'fill-color':
|
||||
self._fill_color = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'stroke-color':
|
||||
self._stroke_color = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'progress-color':
|
||||
self._progress_color = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'percent':
|
||||
self._percent = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
def do_set_property(self, pspec, value):
|
||||
if pspec.name == 'fill-color':
|
||||
self._fill_color = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'stroke-color':
|
||||
self._stroke_color = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'progress-color':
|
||||
self._progress_color = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
elif pspec.name == 'percent':
|
||||
self._percent = value
|
||||
self.emit_paint_needed(0, 0, -1, -1)
|
||||
|
||||
def do_get_property(self, pspec):
|
||||
if pspec.name == 'fill-color':
|
||||
return self._fill_color
|
||||
elif pspec.name == 'stroke-color':
|
||||
return self._stroke_color
|
||||
elif pspec.name == 'progress-color':
|
||||
return self._progress_color
|
||||
elif pspec.name == 'percent':
|
||||
return self._percent
|
||||
def do_get_property(self, pspec):
|
||||
if pspec.name == 'fill-color':
|
||||
return self._fill_color
|
||||
elif pspec.name == 'stroke-color':
|
||||
return self._stroke_color
|
||||
elif pspec.name == 'progress-color':
|
||||
return self._progress_color
|
||||
elif pspec.name == 'percent':
|
||||
return self._percent
|
||||
|
||||
def _int_to_rgb(self, int_color):
|
||||
red = (int_color >> 24) & 0x000000FF
|
||||
green = (int_color >> 16) & 0x000000FF
|
||||
blue = (int_color >> 8) & 0x000000FF
|
||||
alpha = int_color & 0x000000FF
|
||||
return (red / 255.0, green / 255.0, blue / 255.0)
|
||||
def _int_to_rgb(self, int_color):
|
||||
red = (int_color >> 24) & 0x000000FF
|
||||
green = (int_color >> 16) & 0x000000FF
|
||||
blue = (int_color >> 8) & 0x000000FF
|
||||
alpha = int_color & 0x000000FF
|
||||
return (red / 255.0, green / 255.0, blue / 255.0)
|
||||
|
||||
def do_paint_below_children(self, cr, damaged_box):
|
||||
[width, height] = self.get_allocation()
|
||||
def do_paint_below_children(self, cr, damaged_box):
|
||||
[width, height] = self.get_allocation()
|
||||
|
||||
line_width = 3.0
|
||||
x = line_width
|
||||
y = line_width
|
||||
width -= line_width * 2
|
||||
height -= line_width * 2
|
||||
line_width = 3.0
|
||||
x = line_width
|
||||
y = line_width
|
||||
width -= line_width * 2
|
||||
height -= line_width * 2
|
||||
|
||||
cr.move_to(x + self._radius, y);
|
||||
cr.arc(x + width - self._radius, y + self._radius,
|
||||
self._radius, math.pi * 1.5, math.pi * 2);
|
||||
cr.arc(x + width - self._radius, x + height - self._radius,
|
||||
self._radius, 0, math.pi * 0.5);
|
||||
cr.arc(x + self._radius, y + height - self._radius,
|
||||
self._radius, math.pi * 0.5, math.pi);
|
||||
cr.arc(x + self._radius, y + self._radius, self._radius,
|
||||
math.pi, math.pi * 1.5);
|
||||
cr.move_to(x + self._radius, y);
|
||||
cr.arc(x + width - self._radius, y + self._radius,
|
||||
self._radius, math.pi * 1.5, math.pi * 2);
|
||||
cr.arc(x + width - self._radius, x + height - self._radius,
|
||||
self._radius, 0, math.pi * 0.5);
|
||||
cr.arc(x + self._radius, y + height - self._radius,
|
||||
self._radius, math.pi * 0.5, math.pi);
|
||||
cr.arc(x + self._radius, y + self._radius, self._radius,
|
||||
math.pi, math.pi * 1.5);
|
||||
|
||||
color = self._int_to_rgb(self._fill_color)
|
||||
cr.set_source_rgb(*color)
|
||||
cr.fill_preserve();
|
||||
color = self._int_to_rgb(self._fill_color)
|
||||
cr.set_source_rgb(*color)
|
||||
cr.fill_preserve();
|
||||
|
||||
color = self._int_to_rgb(self._stroke_color)
|
||||
cr.set_source_rgb(*color)
|
||||
cr.set_line_width(line_width)
|
||||
cr.stroke();
|
||||
color = self._int_to_rgb(self._stroke_color)
|
||||
cr.set_source_rgb(*color)
|
||||
cr.set_line_width(line_width)
|
||||
cr.stroke();
|
||||
|
||||
if self._percent > 0:
|
||||
self._paint_progress_bar(cr, x, y, width, height, line_width)
|
||||
if self._percent > 0:
|
||||
self._paint_progress_bar(cr, x, y, width, height, line_width)
|
||||
|
||||
def _paint_progress_bar(self, cr, x, y, width, height, line_width):
|
||||
prog_x = x + line_width
|
||||
prog_y = y + line_width
|
||||
prog_width = (width - (line_width * 2)) * (self._percent / 100.0)
|
||||
prog_height = (height - (line_width * 2))
|
||||
def _paint_progress_bar(self, cr, x, y, width, height, line_width):
|
||||
prog_x = x + line_width
|
||||
prog_y = y + line_width
|
||||
prog_width = (width - (line_width * 2)) * (self._percent / 100.0)
|
||||
prog_height = (height - (line_width * 2))
|
||||
|
||||
x = prog_x
|
||||
y = prog_y
|
||||
width = prog_width
|
||||
height = prog_height
|
||||
x = prog_x
|
||||
y = prog_y
|
||||
width = prog_width
|
||||
height = prog_height
|
||||
|
||||
cr.move_to(x + self._radius, y);
|
||||
cr.arc(x + width - self._radius, y + self._radius,
|
||||
self._radius, math.pi * 1.5, math.pi * 2);
|
||||
cr.arc(x + width - self._radius, x + height - self._radius,
|
||||
self._radius, 0, math.pi * 0.5);
|
||||
cr.arc(x + self._radius, y + height - self._radius,
|
||||
self._radius, math.pi * 0.5, math.pi);
|
||||
cr.arc(x + self._radius, y + self._radius, self._radius,
|
||||
math.pi, math.pi * 1.5);
|
||||
cr.move_to(x + self._radius, y);
|
||||
cr.arc(x + width - self._radius, y + self._radius,
|
||||
self._radius, math.pi * 1.5, math.pi * 2);
|
||||
cr.arc(x + width - self._radius, x + height - self._radius,
|
||||
self._radius, 0, math.pi * 0.5);
|
||||
cr.arc(x + self._radius, y + height - self._radius,
|
||||
self._radius, math.pi * 0.5, math.pi);
|
||||
cr.arc(x + self._radius, y + self._radius, self._radius,
|
||||
math.pi, math.pi * 1.5);
|
||||
|
||||
color = self._int_to_rgb(self._progress_color)
|
||||
cr.set_source_rgb(*color)
|
||||
cr.fill_preserve();
|
||||
color = self._int_to_rgb(self._progress_color)
|
||||
cr.set_source_rgb(*color)
|
||||
cr.fill_preserve();
|
||||
|
||||
+750
-750
File diff suppressed because it is too large
Load Diff
+345
-345
@@ -26,65 +26,65 @@ import logging
|
||||
|
||||
import nmclient
|
||||
try:
|
||||
from sugar import env
|
||||
from sugar import env
|
||||
except ImportError:
|
||||
pass
|
||||
pass
|
||||
|
||||
NM_INFO_IFACE='org.freedesktop.NetworkManagerInfo'
|
||||
NM_INFO_PATH='/org/freedesktop/NetworkManagerInfo'
|
||||
|
||||
|
||||
class NoNetworks(dbus.DBusException):
|
||||
def __init__(self):
|
||||
dbus.DBusException.__init__(self)
|
||||
self._dbus_error_name = NM_INFO_IFACE + '.NoNetworks'
|
||||
def __init__(self):
|
||||
dbus.DBusException.__init__(self)
|
||||
self._dbus_error_name = NM_INFO_IFACE + '.NoNetworks'
|
||||
|
||||
class CanceledKeyRequestError(dbus.DBusException):
|
||||
def __init__(self):
|
||||
dbus.DBusException.__init__(self)
|
||||
self._dbus_error_name = NM_INFO_IFACE + '.CanceledError'
|
||||
def __init__(self):
|
||||
dbus.DBusException.__init__(self)
|
||||
self._dbus_error_name = NM_INFO_IFACE + '.CanceledError'
|
||||
|
||||
|
||||
class NetworkInvalidError(Exception):
|
||||
pass
|
||||
pass
|
||||
|
||||
|
||||
class NMConfig(ConfigParser.ConfigParser):
|
||||
def get_bool(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
if type(opt) == type(""):
|
||||
if opt.lower() == 'yes' or opt.lower() == 'true':
|
||||
return True
|
||||
elif opt.lower() == 'no' or opt.lower() == 'false':
|
||||
return False
|
||||
raise ValueError("Invalid format for %s/%s. Should be one of [yes, no, true, false]." % (section, name))
|
||||
def get_bool(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
if type(opt) == type(""):
|
||||
if opt.lower() == 'yes' or opt.lower() == 'true':
|
||||
return True
|
||||
elif opt.lower() == 'no' or opt.lower() == 'false':
|
||||
return False
|
||||
raise ValueError("Invalid format for %s/%s. Should be one of [yes, no, true, false]." % (section, name))
|
||||
|
||||
def get_list(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
if type(opt) == type(""):
|
||||
if not len(opt):
|
||||
return []
|
||||
try:
|
||||
return opt.split()
|
||||
except Exception:
|
||||
pass
|
||||
raise ValueError("Invalid format for %s/%s. Should be a space-separate list." % (section, name))
|
||||
def get_list(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
if type(opt) == type(""):
|
||||
if not len(opt):
|
||||
return []
|
||||
try:
|
||||
return opt.split()
|
||||
except Exception:
|
||||
pass
|
||||
raise ValueError("Invalid format for %s/%s. Should be a space-separate list." % (section, name))
|
||||
|
||||
def get_int(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
try:
|
||||
return int(opt)
|
||||
except Exception:
|
||||
pass
|
||||
raise ValueError("Invalid format for %s/%s. Should be a valid integer." % (section, name))
|
||||
def get_int(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
try:
|
||||
return int(opt)
|
||||
except Exception:
|
||||
pass
|
||||
raise ValueError("Invalid format for %s/%s. Should be a valid integer." % (section, name))
|
||||
|
||||
def get_float(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
try:
|
||||
return float(opt)
|
||||
except Exception:
|
||||
pass
|
||||
raise ValueError("Invalid format for %s/%s. Should be a valid float." % (section, name))
|
||||
def get_float(self, section, name):
|
||||
opt = self.get(section, name)
|
||||
try:
|
||||
return float(opt)
|
||||
except Exception:
|
||||
pass
|
||||
raise ValueError("Invalid format for %s/%s. Should be a valid float." % (section, name))
|
||||
|
||||
|
||||
IW_AUTH_CIPHER_NONE = 0x00000001
|
||||
@@ -102,366 +102,366 @@ NETWORK_TYPE_INVALID = 2
|
||||
|
||||
|
||||
class Security(object):
|
||||
def __init__(self, we_cipher):
|
||||
self._we_cipher = we_cipher
|
||||
def __init__(self, we_cipher):
|
||||
self._we_cipher = we_cipher
|
||||
|
||||
def read_from_config(self, cfg, name):
|
||||
pass
|
||||
def read_from_config(self, cfg, name):
|
||||
pass
|
||||
|
||||
def read_from_args(self, args):
|
||||
pass
|
||||
def read_from_args(self, args):
|
||||
pass
|
||||
|
||||
def new_from_config(cfg, name):
|
||||
security = None
|
||||
try:
|
||||
we_cipher = cfg.get_int(name, "we_cipher")
|
||||
if we_cipher == IW_AUTH_CIPHER_NONE:
|
||||
security = Security(we_cipher)
|
||||
elif we_cipher == IW_AUTH_CIPHER_WEP40 or we_cipher == IW_AUTH_CIPHER_WEP104:
|
||||
security = WEPSecurity(we_cipher)
|
||||
else:
|
||||
# FIXME: find a way to make WPA config option matrix not
|
||||
# make you want to throw up
|
||||
raise ValueError("Unsupported security combo")
|
||||
security.read_from_config(cfg, name)
|
||||
except (ConfigParser.NoOptionError, ValueError), e:
|
||||
return None
|
||||
return security
|
||||
new_from_config = staticmethod(new_from_config)
|
||||
def new_from_config(cfg, name):
|
||||
security = None
|
||||
try:
|
||||
we_cipher = cfg.get_int(name, "we_cipher")
|
||||
if we_cipher == IW_AUTH_CIPHER_NONE:
|
||||
security = Security(we_cipher)
|
||||
elif we_cipher == IW_AUTH_CIPHER_WEP40 or we_cipher == IW_AUTH_CIPHER_WEP104:
|
||||
security = WEPSecurity(we_cipher)
|
||||
else:
|
||||
# FIXME: find a way to make WPA config option matrix not
|
||||
# make you want to throw up
|
||||
raise ValueError("Unsupported security combo")
|
||||
security.read_from_config(cfg, name)
|
||||
except (ConfigParser.NoOptionError, ValueError), e:
|
||||
return None
|
||||
return security
|
||||
new_from_config = staticmethod(new_from_config)
|
||||
|
||||
def new_from_args(we_cipher, args):
|
||||
security = None
|
||||
try:
|
||||
if we_cipher == IW_AUTH_CIPHER_NONE:
|
||||
security = Security(we_cipher)
|
||||
elif we_cipher == IW_AUTH_CIPHER_WEP40 or we_cipher == IW_AUTH_CIPHER_WEP104:
|
||||
security = WEPSecurity(we_cipher)
|
||||
else:
|
||||
# FIXME: find a way to make WPA config option matrix not
|
||||
# make you want to throw up
|
||||
raise ValueError("Unsupported security combo")
|
||||
security.read_from_args(args)
|
||||
except ValueError, e:
|
||||
logging.debug("Error reading security information: %s" % e)
|
||||
del security
|
||||
return None
|
||||
return security
|
||||
new_from_args = staticmethod(new_from_args)
|
||||
def new_from_args(we_cipher, args):
|
||||
security = None
|
||||
try:
|
||||
if we_cipher == IW_AUTH_CIPHER_NONE:
|
||||
security = Security(we_cipher)
|
||||
elif we_cipher == IW_AUTH_CIPHER_WEP40 or we_cipher == IW_AUTH_CIPHER_WEP104:
|
||||
security = WEPSecurity(we_cipher)
|
||||
else:
|
||||
# FIXME: find a way to make WPA config option matrix not
|
||||
# make you want to throw up
|
||||
raise ValueError("Unsupported security combo")
|
||||
security.read_from_args(args)
|
||||
except ValueError, e:
|
||||
logging.debug("Error reading security information: %s" % e)
|
||||
del security
|
||||
return None
|
||||
return security
|
||||
new_from_args = staticmethod(new_from_args)
|
||||
|
||||
def get_properties(self):
|
||||
return [dbus.Int32(self._we_cipher)]
|
||||
def get_properties(self):
|
||||
return [dbus.Int32(self._we_cipher)]
|
||||
|
||||
def write_to_config(self, section, config):
|
||||
config.set(section, "we_cipher", self._we_cipher)
|
||||
def write_to_config(self, section, config):
|
||||
config.set(section, "we_cipher", self._we_cipher)
|
||||
|
||||
|
||||
class WEPSecurity(Security):
|
||||
def read_from_args(self, args):
|
||||
if len(args) != 2:
|
||||
raise ValueError("not enough arguments")
|
||||
key = args[0]
|
||||
auth_alg = args[1]
|
||||
if isinstance(key, unicode):
|
||||
key = key.encode()
|
||||
if not isinstance(key, str):
|
||||
raise ValueError("wrong argument type for key")
|
||||
if not isinstance(auth_alg, int):
|
||||
raise ValueError("wrong argument type for auth_alg")
|
||||
self._key = key
|
||||
self._auth_alg = auth_alg
|
||||
def read_from_args(self, args):
|
||||
if len(args) != 2:
|
||||
raise ValueError("not enough arguments")
|
||||
key = args[0]
|
||||
auth_alg = args[1]
|
||||
if isinstance(key, unicode):
|
||||
key = key.encode()
|
||||
if not isinstance(key, str):
|
||||
raise ValueError("wrong argument type for key")
|
||||
if not isinstance(auth_alg, int):
|
||||
raise ValueError("wrong argument type for auth_alg")
|
||||
self._key = key
|
||||
self._auth_alg = auth_alg
|
||||
|
||||
def read_from_config(self, cfg, name):
|
||||
# Key should be a hex encoded string
|
||||
self._key = cfg.get(name, "key")
|
||||
if self._we_cipher == IW_AUTH_CIPHER_WEP40 and len(self._key) != 10:
|
||||
raise ValueError("Key length not right for 40-bit WEP")
|
||||
if self._we_cipher == IW_AUTH_CIPHER_WEP104 and len(self._key) != 26:
|
||||
raise ValueError("Key length not right for 104-bit WEP")
|
||||
def read_from_config(self, cfg, name):
|
||||
# Key should be a hex encoded string
|
||||
self._key = cfg.get(name, "key")
|
||||
if self._we_cipher == IW_AUTH_CIPHER_WEP40 and len(self._key) != 10:
|
||||
raise ValueError("Key length not right for 40-bit WEP")
|
||||
if self._we_cipher == IW_AUTH_CIPHER_WEP104 and len(self._key) != 26:
|
||||
raise ValueError("Key length not right for 104-bit WEP")
|
||||
|
||||
try:
|
||||
a = binascii.a2b_hex(self._key)
|
||||
except TypeError:
|
||||
raise ValueError("Key was not a hexadecimal string.")
|
||||
|
||||
self._auth_alg = cfg.get_int(name, "auth_alg")
|
||||
if self._auth_alg != IW_AUTH_ALG_OPEN_SYSTEM and self._auth_alg != IW_AUTH_ALG_SHARED_KEY:
|
||||
raise ValueError("Invalid authentication algorithm %d" % self._auth_alg)
|
||||
try:
|
||||
a = binascii.a2b_hex(self._key)
|
||||
except TypeError:
|
||||
raise ValueError("Key was not a hexadecimal string.")
|
||||
|
||||
self._auth_alg = cfg.get_int(name, "auth_alg")
|
||||
if self._auth_alg != IW_AUTH_ALG_OPEN_SYSTEM and self._auth_alg != IW_AUTH_ALG_SHARED_KEY:
|
||||
raise ValueError("Invalid authentication algorithm %d" % self._auth_alg)
|
||||
|
||||
def get_properties(self):
|
||||
args = Security.get_properties(self)
|
||||
args.append(dbus.String(self._key))
|
||||
args.append(dbus.Int32(self._auth_alg))
|
||||
return args
|
||||
def get_properties(self):
|
||||
args = Security.get_properties(self)
|
||||
args.append(dbus.String(self._key))
|
||||
args.append(dbus.Int32(self._auth_alg))
|
||||
return args
|
||||
|
||||
def write_to_config(self, section, config):
|
||||
Security.write_to_config(self, section, config)
|
||||
config.set(section, "key", self._key)
|
||||
config.set(section, "auth_alg", self._auth_alg)
|
||||
def write_to_config(self, section, config):
|
||||
Security.write_to_config(self, section, config)
|
||||
config.set(section, "key", self._key)
|
||||
config.set(section, "auth_alg", self._auth_alg)
|
||||
|
||||
|
||||
class Network:
|
||||
def __init__(self, ssid):
|
||||
self.ssid = ssid
|
||||
self.timestamp = int(time.time())
|
||||
self.bssids = []
|
||||
self.we_cipher = 0
|
||||
self._security = None
|
||||
def __init__(self, ssid):
|
||||
self.ssid = ssid
|
||||
self.timestamp = int(time.time())
|
||||
self.bssids = []
|
||||
self.we_cipher = 0
|
||||
self._security = None
|
||||
|
||||
def get_properties(self):
|
||||
bssid_list = dbus.Array([], signature="s")
|
||||
for item in self.bssids:
|
||||
bssid_list.append(dbus.String(item))
|
||||
args = [dbus.String(self.ssid), dbus.Int32(self.timestamp), dbus.Boolean(True), bssid_list]
|
||||
args += self._security.get_properties()
|
||||
return tuple(args)
|
||||
def get_properties(self):
|
||||
bssid_list = dbus.Array([], signature="s")
|
||||
for item in self.bssids:
|
||||
bssid_list.append(dbus.String(item))
|
||||
args = [dbus.String(self.ssid), dbus.Int32(self.timestamp), dbus.Boolean(True), bssid_list]
|
||||
args += self._security.get_properties()
|
||||
return tuple(args)
|
||||
|
||||
def get_security(self):
|
||||
return self._security.get_properties()
|
||||
def get_security(self):
|
||||
return self._security.get_properties()
|
||||
|
||||
def set_security(self, security):
|
||||
self._security = security
|
||||
def set_security(self, security):
|
||||
self._security = security
|
||||
|
||||
def read_from_args(self, auto, bssid, we_cipher, args):
|
||||
if auto == False:
|
||||
self.timestamp = int(time.time())
|
||||
if not bssid in self.bssids:
|
||||
self.bssids.append(bssid)
|
||||
def read_from_args(self, auto, bssid, we_cipher, args):
|
||||
if auto == False:
|
||||
self.timestamp = int(time.time())
|
||||
if not bssid in self.bssids:
|
||||
self.bssids.append(bssid)
|
||||
|
||||
self._security = Security.new_from_args(we_cipher, args)
|
||||
if not self._security:
|
||||
raise NetworkInvalidError("Invalid security information")
|
||||
self._security = Security.new_from_args(we_cipher, args)
|
||||
if not self._security:
|
||||
raise NetworkInvalidError("Invalid security information")
|
||||
|
||||
def read_from_config(self, config):
|
||||
try:
|
||||
self.timestamp = config.get_int(self.ssid, "timestamp")
|
||||
except (ConfigParser.NoOptionError, ValueError), e:
|
||||
raise NetworkInvalidError(e)
|
||||
def read_from_config(self, config):
|
||||
try:
|
||||
self.timestamp = config.get_int(self.ssid, "timestamp")
|
||||
except (ConfigParser.NoOptionError, ValueError), e:
|
||||
raise NetworkInvalidError(e)
|
||||
|
||||
self._security = Security.new_from_config(config, self.ssid)
|
||||
if not self._security:
|
||||
raise NetworkInvalidError(e)
|
||||
self._security = Security.new_from_config(config, self.ssid)
|
||||
if not self._security:
|
||||
raise NetworkInvalidError(e)
|
||||
|
||||
# The following don't need to be present
|
||||
try:
|
||||
self.bssids = config.get_list(self.ssid, "bssids")
|
||||
except (ConfigParser.NoOptionError, ValueError), e:
|
||||
pass
|
||||
# The following don't need to be present
|
||||
try:
|
||||
self.bssids = config.get_list(self.ssid, "bssids")
|
||||
except (ConfigParser.NoOptionError, ValueError), e:
|
||||
pass
|
||||
|
||||
def write_to_config(self, config):
|
||||
try:
|
||||
config.add_section(self.ssid)
|
||||
config.set(self.ssid, "timestamp", self.timestamp)
|
||||
if len(self.bssids) > 0:
|
||||
opt = " "
|
||||
opt.join(self.bssids)
|
||||
config.set(self.ssid, "bssids", opt)
|
||||
self._security.write_to_config(self.ssid, config)
|
||||
except Exception, e:
|
||||
logging.debug("Error writing '%s': %s" % (self.ssid, e))
|
||||
def write_to_config(self, config):
|
||||
try:
|
||||
config.add_section(self.ssid)
|
||||
config.set(self.ssid, "timestamp", self.timestamp)
|
||||
if len(self.bssids) > 0:
|
||||
opt = " "
|
||||
opt.join(self.bssids)
|
||||
config.set(self.ssid, "bssids", opt)
|
||||
self._security.write_to_config(self.ssid, config)
|
||||
except Exception, e:
|
||||
logging.debug("Error writing '%s': %s" % (self.ssid, e))
|
||||
|
||||
|
||||
class NotFoundError(dbus.DBusException):
|
||||
pass
|
||||
pass
|
||||
class UnsupportedError(dbus.DBusException):
|
||||
pass
|
||||
pass
|
||||
|
||||
class NMInfoDBusServiceHelper(dbus.service.Object):
|
||||
def __init__(self, parent):
|
||||
self._parent = parent
|
||||
bus = dbus.SystemBus()
|
||||
def __init__(self, parent):
|
||||
self._parent = parent
|
||||
bus = dbus.SystemBus()
|
||||
|
||||
# If NMI is already around, don't grab the NMI service
|
||||
bus_object = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
|
||||
name = None
|
||||
try:
|
||||
name = bus_object.GetNameOwner("org.freedesktop.NetworkManagerInfo", \
|
||||
dbus_interface='org.freedesktop.DBus')
|
||||
except dbus.DBusException:
|
||||
pass
|
||||
if name:
|
||||
logging.debug("NMI service already owned by %s, won't claim it." % name)
|
||||
raise RuntimeError
|
||||
# If NMI is already around, don't grab the NMI service
|
||||
bus_object = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
|
||||
name = None
|
||||
try:
|
||||
name = bus_object.GetNameOwner("org.freedesktop.NetworkManagerInfo", \
|
||||
dbus_interface='org.freedesktop.DBus')
|
||||
except dbus.DBusException:
|
||||
pass
|
||||
if name:
|
||||
logging.debug("NMI service already owned by %s, won't claim it." % name)
|
||||
raise RuntimeError
|
||||
|
||||
bus_name = dbus.service.BusName(NM_INFO_IFACE, bus=bus)
|
||||
dbus.service.Object.__init__(self, bus_name, NM_INFO_PATH)
|
||||
bus_name = dbus.service.BusName(NM_INFO_IFACE, bus=bus)
|
||||
dbus.service.Object.__init__(self, bus_name, NM_INFO_PATH)
|
||||
|
||||
@dbus.service.method(NM_INFO_IFACE, in_signature='i', out_signature='as')
|
||||
def getNetworks(self, net_type):
|
||||
ssids = self._parent.get_networks(net_type)
|
||||
if len(ssids) > 0:
|
||||
return dbus.Array(ssids)
|
||||
@dbus.service.method(NM_INFO_IFACE, in_signature='i', out_signature='as')
|
||||
def getNetworks(self, net_type):
|
||||
ssids = self._parent.get_networks(net_type)
|
||||
if len(ssids) > 0:
|
||||
return dbus.Array(ssids)
|
||||
|
||||
raise NoNetworks()
|
||||
raise NoNetworks()
|
||||
|
||||
@dbus.service.method(NM_INFO_IFACE, in_signature='si', async_callbacks=('async_cb', 'async_err_cb'))
|
||||
def getNetworkProperties(self, ssid, net_type, async_cb, async_err_cb):
|
||||
self._parent.get_network_properties(ssid, net_type, async_cb, async_err_cb)
|
||||
@dbus.service.method(NM_INFO_IFACE, in_signature='si', async_callbacks=('async_cb', 'async_err_cb'))
|
||||
def getNetworkProperties(self, ssid, net_type, async_cb, async_err_cb):
|
||||
self._parent.get_network_properties(ssid, net_type, async_cb, async_err_cb)
|
||||
|
||||
@dbus.service.method(NM_INFO_IFACE)
|
||||
def updateNetworkInfo(self, ssid, bauto, bssid, cipher, *args):
|
||||
self._parent.update_network_info(ssid, bauto, bssid, cipher, args)
|
||||
@dbus.service.method(NM_INFO_IFACE)
|
||||
def updateNetworkInfo(self, ssid, bauto, bssid, cipher, *args):
|
||||
self._parent.update_network_info(ssid, bauto, bssid, cipher, args)
|
||||
|
||||
@dbus.service.method(NM_INFO_IFACE, async_callbacks=('async_cb', 'async_err_cb'))
|
||||
def getKeyForNetwork(self, dev_path, net_path, ssid, attempt, new_key, async_cb, async_err_cb):
|
||||
self._parent.get_key_for_network(dev_path, net_path, ssid,
|
||||
attempt, new_key, async_cb, async_err_cb)
|
||||
@dbus.service.method(NM_INFO_IFACE, async_callbacks=('async_cb', 'async_err_cb'))
|
||||
def getKeyForNetwork(self, dev_path, net_path, ssid, attempt, new_key, async_cb, async_err_cb):
|
||||
self._parent.get_key_for_network(dev_path, net_path, ssid,
|
||||
attempt, new_key, async_cb, async_err_cb)
|
||||
|
||||
@dbus.service.method(NM_INFO_IFACE)
|
||||
def cancelGetKeyForNetwork(self):
|
||||
self._parent.cancel_get_key_for_network()
|
||||
@dbus.service.method(NM_INFO_IFACE)
|
||||
def cancelGetKeyForNetwork(self):
|
||||
self._parent.cancel_get_key_for_network()
|
||||
|
||||
class NMInfo(object):
|
||||
def __init__(self, client):
|
||||
try:
|
||||
profile_path = env.get_profile_path()
|
||||
except NameError:
|
||||
home = os.path.expanduser("~")
|
||||
profile_path = os.path.join(home, ".sugar", "default")
|
||||
self._cfg_file = os.path.join(profile_path, "nm", "networks.cfg")
|
||||
self._nmclient = client
|
||||
self._allowed_networks = self._read_config()
|
||||
self._dbus_helper = NMInfoDBusServiceHelper(self)
|
||||
def __init__(self, client):
|
||||
try:
|
||||
profile_path = env.get_profile_path()
|
||||
except NameError:
|
||||
home = os.path.expanduser("~")
|
||||
profile_path = os.path.join(home, ".sugar", "default")
|
||||
self._cfg_file = os.path.join(profile_path, "nm", "networks.cfg")
|
||||
self._nmclient = client
|
||||
self._allowed_networks = self._read_config()
|
||||
self._dbus_helper = NMInfoDBusServiceHelper(self)
|
||||
|
||||
def save_config(self):
|
||||
self._write_config(self._allowed_networks)
|
||||
def save_config(self):
|
||||
self._write_config(self._allowed_networks)
|
||||
|
||||
def _read_config(self):
|
||||
if not os.path.exists(os.path.dirname(self._cfg_file)):
|
||||
os.makedirs(os.path.dirname(self._cfg_file), 0755)
|
||||
if not os.path.exists(self._cfg_file):
|
||||
self._write_config({})
|
||||
return {}
|
||||
def _read_config(self):
|
||||
if not os.path.exists(os.path.dirname(self._cfg_file)):
|
||||
os.makedirs(os.path.dirname(self._cfg_file), 0755)
|
||||
if not os.path.exists(self._cfg_file):
|
||||
self._write_config({})
|
||||
return {}
|
||||
|
||||
config = NMConfig()
|
||||
config.read(self._cfg_file)
|
||||
networks = {}
|
||||
for name in config.sections():
|
||||
if not isinstance(name, unicode):
|
||||
name = unicode(name)
|
||||
net = Network(name)
|
||||
try:
|
||||
net.read_from_config(config)
|
||||
networks[name] = net
|
||||
except NetworkInvalidError, e:
|
||||
logging.debug("Error: invalid stored network config: %s" % e)
|
||||
del net
|
||||
del config
|
||||
return networks
|
||||
config = NMConfig()
|
||||
config.read(self._cfg_file)
|
||||
networks = {}
|
||||
for name in config.sections():
|
||||
if not isinstance(name, unicode):
|
||||
name = unicode(name)
|
||||
net = Network(name)
|
||||
try:
|
||||
net.read_from_config(config)
|
||||
networks[name] = net
|
||||
except NetworkInvalidError, e:
|
||||
logging.debug("Error: invalid stored network config: %s" % e)
|
||||
del net
|
||||
del config
|
||||
return networks
|
||||
|
||||
def _write_config(self, networks):
|
||||
fp = open(self._cfg_file, 'w')
|
||||
config = NMConfig()
|
||||
for net in networks.values():
|
||||
net.write_to_config(config)
|
||||
config.write(fp)
|
||||
fp.close()
|
||||
del config
|
||||
def _write_config(self, networks):
|
||||
fp = open(self._cfg_file, 'w')
|
||||
config = NMConfig()
|
||||
for net in networks.values():
|
||||
net.write_to_config(config)
|
||||
config.write(fp)
|
||||
fp.close()
|
||||
del config
|
||||
|
||||
def get_networks(self, net_type):
|
||||
if net_type != NETWORK_TYPE_ALLOWED:
|
||||
raise ValueError("Bad network type")
|
||||
nets = []
|
||||
for net in self._allowed_networks.values():
|
||||
nets.append(net.ssid)
|
||||
logging.debug("Returning networks: %s" % nets)
|
||||
return nets
|
||||
def get_networks(self, net_type):
|
||||
if net_type != NETWORK_TYPE_ALLOWED:
|
||||
raise ValueError("Bad network type")
|
||||
nets = []
|
||||
for net in self._allowed_networks.values():
|
||||
nets.append(net.ssid)
|
||||
logging.debug("Returning networks: %s" % nets)
|
||||
return nets
|
||||
|
||||
def get_network_properties(self, ssid, net_type, async_cb, async_err_cb):
|
||||
if not isinstance(ssid, unicode):
|
||||
async_err_cb(ValueError("Invalid arguments; ssid must be unicode."))
|
||||
if net_type != NETWORK_TYPE_ALLOWED:
|
||||
async_err_cb(ValueError("Bad network type"))
|
||||
if not self._allowed_networks.has_key(ssid):
|
||||
async_err_cb(NotFoundError("Network '%s' not found." % ssid))
|
||||
network = self._allowed_networks[ssid]
|
||||
props = network.get_properties()
|
||||
def get_network_properties(self, ssid, net_type, async_cb, async_err_cb):
|
||||
if not isinstance(ssid, unicode):
|
||||
async_err_cb(ValueError("Invalid arguments; ssid must be unicode."))
|
||||
if net_type != NETWORK_TYPE_ALLOWED:
|
||||
async_err_cb(ValueError("Bad network type"))
|
||||
if not self._allowed_networks.has_key(ssid):
|
||||
async_err_cb(NotFoundError("Network '%s' not found." % ssid))
|
||||
network = self._allowed_networks[ssid]
|
||||
props = network.get_properties()
|
||||
|
||||
# DBus workaround: the normal method return handler wraps
|
||||
# the returned arguments in a tuple and then converts that to a
|
||||
# struct, but NetworkManager expects a plain list of arguments.
|
||||
# It turns out that the async callback method return code _doesn't_
|
||||
# wrap the returned arguments in a tuple, so as a workaround use
|
||||
# the async callback stuff here even though we're not doing it
|
||||
# asynchronously.
|
||||
async_cb(*props)
|
||||
# DBus workaround: the normal method return handler wraps
|
||||
# the returned arguments in a tuple and then converts that to a
|
||||
# struct, but NetworkManager expects a plain list of arguments.
|
||||
# It turns out that the async callback method return code _doesn't_
|
||||
# wrap the returned arguments in a tuple, so as a workaround use
|
||||
# the async callback stuff here even though we're not doing it
|
||||
# asynchronously.
|
||||
async_cb(*props)
|
||||
|
||||
def update_network_info(self, ssid, auto, bssid, we_cipher, args):
|
||||
if not isinstance(ssid, unicode):
|
||||
raise ValueError("Invalid arguments; ssid must be unicode.")
|
||||
if self._allowed_networks.has_key(ssid):
|
||||
del self._allowed_networks[ssid]
|
||||
net = Network(ssid)
|
||||
try:
|
||||
net.read_from_args(auto, bssid, we_cipher, args)
|
||||
logging.debug("Updated network information for '%s'." % ssid)
|
||||
self._allowed_networks[ssid] = net
|
||||
self.save_config()
|
||||
except NetworkInvalidError, e:
|
||||
logging.debug("Error updating network information: %s" % e)
|
||||
del net
|
||||
def update_network_info(self, ssid, auto, bssid, we_cipher, args):
|
||||
if not isinstance(ssid, unicode):
|
||||
raise ValueError("Invalid arguments; ssid must be unicode.")
|
||||
if self._allowed_networks.has_key(ssid):
|
||||
del self._allowed_networks[ssid]
|
||||
net = Network(ssid)
|
||||
try:
|
||||
net.read_from_args(auto, bssid, we_cipher, args)
|
||||
logging.debug("Updated network information for '%s'." % ssid)
|
||||
self._allowed_networks[ssid] = net
|
||||
self.save_config()
|
||||
except NetworkInvalidError, e:
|
||||
logging.debug("Error updating network information: %s" % e)
|
||||
del net
|
||||
|
||||
def get_key_for_network(self, dev_op, net_op, ssid, attempt, new_key, async_cb, async_err_cb):
|
||||
if not isinstance(ssid, unicode):
|
||||
raise ValueError("Invalid arguments; ssid must be unicode.")
|
||||
if self._allowed_networks.has_key(ssid) and not new_key:
|
||||
# We've got the info already
|
||||
net = self._allowed_networks[ssid]
|
||||
async_cb(tuple(net.get_security()))
|
||||
return
|
||||
def get_key_for_network(self, dev_op, net_op, ssid, attempt, new_key, async_cb, async_err_cb):
|
||||
if not isinstance(ssid, unicode):
|
||||
raise ValueError("Invalid arguments; ssid must be unicode.")
|
||||
if self._allowed_networks.has_key(ssid) and not new_key:
|
||||
# We've got the info already
|
||||
net = self._allowed_networks[ssid]
|
||||
async_cb(tuple(net.get_security()))
|
||||
return
|
||||
|
||||
# Otherwise, ask the user for it
|
||||
net = None
|
||||
dev = self._nmclient.get_device(dev_op)
|
||||
if not dev:
|
||||
async_err_cb(NotFoundError("Device was unknown."))
|
||||
return
|
||||
# Otherwise, ask the user for it
|
||||
net = None
|
||||
dev = self._nmclient.get_device(dev_op)
|
||||
if not dev:
|
||||
async_err_cb(NotFoundError("Device was unknown."))
|
||||
return
|
||||
|
||||
if dev.get_type() == nmclient.DEVICE_TYPE_802_3_ETHERNET:
|
||||
# We don't support wired 802.1x yet...
|
||||
async_err_cb(UnsupportedError("Device type is unsupported by NMI."))
|
||||
return
|
||||
if dev.get_type() == nmclient.DEVICE_TYPE_802_3_ETHERNET:
|
||||
# We don't support wired 802.1x yet...
|
||||
async_err_cb(UnsupportedError("Device type is unsupported by NMI."))
|
||||
return
|
||||
|
||||
net = dev.get_network(net_op)
|
||||
if not net:
|
||||
async_err_cb(NotFoundError("Network was unknown."))
|
||||
return
|
||||
net = dev.get_network(net_op)
|
||||
if not net:
|
||||
async_err_cb(NotFoundError("Network was unknown."))
|
||||
return
|
||||
|
||||
self._nmclient.get_key_for_network(net, async_cb, async_err_cb)
|
||||
self._nmclient.get_key_for_network(net, async_cb, async_err_cb)
|
||||
|
||||
def get_key_for_network_cb(self, net, key, auth_alg, async_cb, async_err_cb, canceled=False):
|
||||
"""
|
||||
Called by the NMClient when the Wireless Network Key dialog
|
||||
is closed.
|
||||
"""
|
||||
if canceled:
|
||||
e = CanceledKeyRequestError("Request was canceled.")
|
||||
# key dialog dialog was canceled; send the error back to NM
|
||||
async_err_cb(e)
|
||||
return
|
||||
def get_key_for_network_cb(self, net, key, auth_alg, async_cb, async_err_cb, canceled=False):
|
||||
"""
|
||||
Called by the NMClient when the Wireless Network Key dialog
|
||||
is closed.
|
||||
"""
|
||||
if canceled:
|
||||
e = CanceledKeyRequestError("Request was canceled.")
|
||||
# key dialog dialog was canceled; send the error back to NM
|
||||
async_err_cb(e)
|
||||
return
|
||||
|
||||
if not key or not auth_alg:
|
||||
# no key returned, *** BUG ***; the key dialog
|
||||
# should always return either a key + auth_alg, or a
|
||||
#cancel error
|
||||
raise RuntimeError("No key or auth alg given! Bug!")
|
||||
if not key or not auth_alg:
|
||||
# no key returned, *** BUG ***; the key dialog
|
||||
# should always return either a key + auth_alg, or a
|
||||
#cancel error
|
||||
raise RuntimeError("No key or auth alg given! Bug!")
|
||||
|
||||
we_cipher = None
|
||||
if len(key) == 26:
|
||||
we_cipher = IW_AUTH_CIPHER_WEP104
|
||||
elif len(key) == 10:
|
||||
we_cipher = IW_AUTH_CIPHER_WEP40
|
||||
else:
|
||||
raise RuntimeError("Invalid key length!")
|
||||
we_cipher = None
|
||||
if len(key) == 26:
|
||||
we_cipher = IW_AUTH_CIPHER_WEP104
|
||||
elif len(key) == 10:
|
||||
we_cipher = IW_AUTH_CIPHER_WEP40
|
||||
else:
|
||||
raise RuntimeError("Invalid key length!")
|
||||
|
||||
# Stuff the returned key and auth algorithm into a security object
|
||||
# and return it to NetworkManager
|
||||
sec = Security.new_from_args(we_cipher, (key, auth_alg))
|
||||
if not sec:
|
||||
raise RuntimeError("Invalid security arguments.")
|
||||
props = sec.get_properties()
|
||||
a = tuple(props)
|
||||
async_cb(*a)
|
||||
# Stuff the returned key and auth algorithm into a security object
|
||||
# and return it to NetworkManager
|
||||
sec = Security.new_from_args(we_cipher, (key, auth_alg))
|
||||
if not sec:
|
||||
raise RuntimeError("Invalid security arguments.")
|
||||
props = sec.get_properties()
|
||||
a = tuple(props)
|
||||
async_cb(*a)
|
||||
|
||||
def cancel_get_key_for_network(self):
|
||||
# Tell the NMClient to close the key request dialog
|
||||
self._nmclient.cancel_get_key_for_network()
|
||||
def cancel_get_key_for_network(self):
|
||||
# Tell the NMClient to close the key request dialog
|
||||
self._nmclient.cancel_get_key_for_network()
|
||||
|
||||
+40
-40
@@ -22,60 +22,60 @@ IW_AUTH_ALG_OPEN_SYSTEM = 0x00000001
|
||||
IW_AUTH_ALG_SHARED_KEY = 0x00000002
|
||||
|
||||
class WEPKeyDialog(gtk.Dialog):
|
||||
def __init__(self, net, async_cb, async_err_cb):
|
||||
gtk.Dialog.__init__(self)
|
||||
self.set_title("Wireless Key Required")
|
||||
def __init__(self, net, async_cb, async_err_cb):
|
||||
gtk.Dialog.__init__(self)
|
||||
self.set_title("Wireless Key Required")
|
||||
|
||||
self._net = net
|
||||
self._async_cb = async_cb
|
||||
self._async_err_cb = async_err_cb
|
||||
self._net = net
|
||||
self._async_cb = async_cb
|
||||
self._async_err_cb = async_err_cb
|
||||
|
||||
self.set_has_separator(False)
|
||||
self.set_has_separator(False)
|
||||
|
||||
label = gtk.Label("A wireless encryption key is required for\n" \
|
||||
" the wireless network '%s'." % net.get_ssid())
|
||||
self.vbox.pack_start(label)
|
||||
label = gtk.Label("A wireless encryption key is required for\n" \
|
||||
" the wireless network '%s'." % net.get_ssid())
|
||||
self.vbox.pack_start(label)
|
||||
|
||||
self._entry = gtk.Entry()
|
||||
self._entry.props.visibility = False
|
||||
self._entry.connect('changed', self._entry_changed_cb)
|
||||
self.vbox.pack_start(self._entry)
|
||||
self.vbox.show_all()
|
||||
self._entry = gtk.Entry()
|
||||
self._entry.props.visibility = False
|
||||
self._entry.connect('changed', self._entry_changed_cb)
|
||||
self.vbox.pack_start(self._entry)
|
||||
self.vbox.show_all()
|
||||
|
||||
self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
|
||||
gtk.STOCK_OK, gtk.RESPONSE_OK)
|
||||
self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
|
||||
gtk.STOCK_OK, gtk.RESPONSE_OK)
|
||||
|
||||
self.set_default_response(gtk.RESPONSE_OK)
|
||||
self._update_response_sensitivity()
|
||||
self.set_default_response(gtk.RESPONSE_OK)
|
||||
self._update_response_sensitivity()
|
||||
|
||||
def get_key(self):
|
||||
return self._entry.get_text()
|
||||
def get_key(self):
|
||||
return self._entry.get_text()
|
||||
|
||||
def get_auth_alg(self):
|
||||
return IW_AUTH_ALG_OPEN_SYSTEM
|
||||
def get_auth_alg(self):
|
||||
return IW_AUTH_ALG_OPEN_SYSTEM
|
||||
|
||||
def get_network(self):
|
||||
return self._net
|
||||
def get_network(self):
|
||||
return self._net
|
||||
|
||||
def get_callbacks(self):
|
||||
return (self._async_cb, self._async_err_cb)
|
||||
def get_callbacks(self):
|
||||
return (self._async_cb, self._async_err_cb)
|
||||
|
||||
def _entry_changed_cb(self, entry):
|
||||
self._update_response_sensitivity()
|
||||
def _entry_changed_cb(self, entry):
|
||||
self._update_response_sensitivity()
|
||||
|
||||
def _update_response_sensitivity(self):
|
||||
key = self.get_key()
|
||||
def _update_response_sensitivity(self):
|
||||
key = self.get_key()
|
||||
|
||||
is_hex = True
|
||||
for c in key:
|
||||
if not 'a' <= c <= 'f' and not '0' <= c <= '9':
|
||||
is_hex = False
|
||||
is_hex = True
|
||||
for c in key:
|
||||
if not 'a' <= c <= 'f' and not '0' <= c <= '9':
|
||||
is_hex = False
|
||||
|
||||
valid_len = (len(key) == 10 or len(key) == 26)
|
||||
self.set_response_sensitive(gtk.RESPONSE_OK, is_hex and valid_len)
|
||||
valid_len = (len(key) == 10 or len(key) == 26)
|
||||
self.set_response_sensitive(gtk.RESPONSE_OK, is_hex and valid_len)
|
||||
|
||||
if __name__ == "__main__":
|
||||
dialog = WEPKeyDialog()
|
||||
dialog.run()
|
||||
dialog = WEPKeyDialog()
|
||||
dialog.run()
|
||||
|
||||
print dialog.get_key()
|
||||
print dialog.get_key()
|
||||
|
||||
Reference in New Issue
Block a user