gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-02-22 10:05:48 +01:00
Code Issues Projects Releases Wiki Activity

Correctly handle case where a key is all digits and starts with a '0'.

Browse Source 
Remove some unused imports.
Simplfy code that checks for valid wpa_supplicant drivers.
This commit is contained in:
Dan O'Reilly
2009-04-27 19:17:01 -04:00
parent 6650c84aec
commit 531cde7250
10 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wicd/autoconnect.py
View File

@@ -23,7 +23,6 @@ from wicd import dbusmanager
import dbus import dbus
import time import time
import gobject
import sys import sys
if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0): if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0):

3
wicd/configmanager.py
View File

@@ -106,7 +106,8 @@ class ConfigManager(RawConfigParser):
# Try to intelligently handle the type of the return value. # Try to intelligently handle the type of the return value.
try: try:
ret = int(ret) if not ret.startswith('0') or len(ret) == 1:
ret = int(ret)
except (ValueError, TypeError): except (ValueError, TypeError):
ret = Noneify(ret) ret = Noneify(ret)
# This is a workaround for a python-dbus issue on 64-bit systems. # This is a workaround for a python-dbus issue on 64-bit systems.

1
wicd/dbusmanager.py
View File

@@ -24,7 +24,6 @@ A module for managing wicd's dbus interfaces.
# #
import dbus import dbus
from dbus import DBusException
if getattr(dbus, "version", (0, 0, 0)) < (0, 80, 0): if getattr(dbus, "version", (0, 0, 0)) < (0, 80, 0):
import dbus.glib import dbus.glib
else: else:

5
wicd/gui.py
View File

@@ -31,7 +31,6 @@ import pango
import gtk import gtk
import gtk.glade import gtk.glade
from dbus import DBusException from dbus import DBusException
from dbus import version as dbus_version
from wicd import misc from wicd import misc
from wicd import wpath from wicd import wpath
@@ -41,7 +40,7 @@ from wicd import netentry
from wicd.misc import noneToString from wicd.misc import noneToString
from wicd.netentry import WiredNetworkEntry, WirelessNetworkEntry from wicd.netentry import WiredNetworkEntry, WirelessNetworkEntry
from wicd.prefs import PreferencesDialog from wicd.prefs import PreferencesDialog
from wicd.guiutil import error, GreyLabel, LabelEntry, SmallLabel from wicd.guiutil import error, LabelEntry
from wicd.translations import language from wicd.translations import language
if __name__ == '__main__': if __name__ == '__main__':
@@ -709,7 +708,7 @@ class appGui(object):
try: try:
daemon.WriteWindowSize(width, height, "main") daemon.WriteWindowSize(width, height, "main")
daemon.SetGUIOpen(False) daemon.SetGUIOpen(False)
except dbusmanager.DBusException: except DBusException:
pass pass
if self.standalone: if self.standalone:

2
wicd/logfile.py
View File

@@ -25,8 +25,6 @@ import sys
import os import os
import time import time
import wicd.wpath as wpath
class SizeError(IOError): class SizeError(IOError):
pass pass

3
wicd/monitor.py
View File

@@ -26,7 +26,6 @@ when appropriate.
import gobject import gobject
import time import time
import sys
from dbus import DBusException from dbus import DBusException
@@ -53,7 +52,7 @@ def diewithdbus(func):
ret = func(self, *__args, **__kargs) ret = func(self, *__args, **__kargs)
self.__lost_dbus_count = 0 self.__lost_dbus_count = 0
return ret return ret
except dbusmanager.DBusException, e: except DBusException, e:
print "Caught exception %s" % str(e) print "Caught exception %s" % str(e)
if not hasattr(self, "__lost_dbus_count"): if not hasattr(self, "__lost_dbus_count"):
self.__lost_dbus_count = 0 self.__lost_dbus_count = 0

2
wicd/netentry.py
View File

@@ -29,7 +29,7 @@ import misc
import wpath import wpath
import dbusmanager import dbusmanager
from misc import noneToString, stringToNone, noneToBlankString, to_bool from misc import noneToString, stringToNone, noneToBlankString, to_bool
from guiutil import error, SmallLabel, LabelEntry, GreyLabel, LeftAlignedLabel, string_input from guiutil import error, LabelEntry, GreyLabel, LeftAlignedLabel, string_input
from translations import language from translations import language

2
wicd/prefs.py
View File

@@ -26,7 +26,7 @@ handles recieving/sendings the settings from/to the daemon.
import gtk import gtk
import gobject import gobject
import pango #import pango
import os import os
import gtk.glade import gtk.glade

1
wicd/wicd-client.py
View File

@@ -40,7 +40,6 @@ import gobject
import getopt import getopt
import os import os
import pango import pango
import time
import atexit import atexit
from dbus import DBusException from dbus import DBusException

12
wicd/wnettools.py
View File

@@ -112,10 +112,9 @@ def GetWirelessInterfaces():
""" """
dev_dir = '/sys/class/net/' dev_dir = '/sys/class/net/'
ifnames = [] ifnames = [iface for iface in os.listdir(dev_dir)
if os.path.isdir(dev_dir + iface) and
ifnames = [iface for iface in os.listdir(dev_dir) if os.path.isdir(dev_dir + iface) 'wireless' in os.listdir(dev_dir + iface)]
and 'wireless' in os.listdir(dev_dir + iface)]
return ifnames return ifnames
@@ -134,10 +133,7 @@ def IsValidWpaSuppDriver(driver):
""" Returns True if given string is a valid wpa_supplicant driver. """ """ Returns True if given string is a valid wpa_supplicant driver. """
output = misc.Run(["wpa_supplicant", "-D%s" % driver, "-iolan19", output = misc.Run(["wpa_supplicant", "-D%s" % driver, "-iolan19",
"-c/etc/abcd%sdefzz.zconfz" % random.randint(1, 1000)]) "-c/etc/abcd%sdefzz.zconfz" % random.randint(1, 1000)])
if re.match("Unsupported driver", output): return not "Unsupported driver" in output
return False
else:
return True
def neediface(default_response): def neediface(default_response):
""" A decorator for only running a method if self.iface is defined. """ A decorator for only running a method if self.iface is defined.