Merged mainline. This will require one more change to the NEWS file

to handle conflicts.

wicd/autoconnect.py

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

wicd/configmanager.py

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

wicd/dbusmanager.py

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

wicd/gui.py

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

wicd/logfile.py

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

wicd/monitor.py

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

wicd/netentry.py

@@ -29,7 +29,7 @@ import misc
 import wpath
 import dbusmanager
 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
 

wicd/prefs.py

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

wicd/wicd-client.py

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

wicd/wnettools.py

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