Merge lp:~fox1991/wicd/fox into lp:wicd/1.6

[fox91]

I fixed a little bug in the clients (it's a silly thing but i didn't like it):
when you connect to a wireless network sometimes the statusbar message was a bit confusing, instead of showing <essid>: <connecting status> it showed None or another essid instead of the one of the network it was connecting to.

Then i noticed i little bug in the cli client, if using -c without -n it raised an exception.
in the cli-client i changed tabs into 4 spaces

[David Paleino (dpaleino)]

Hello,

I merged your rev. 572, and will soon push it.

However, I don't quite understand your 573. Ok, there might be some mixed tabs-and-spaces indentation, but that would've been best addressed in a separate commit. If there's a real fix, it's hidden in that huge diff.

Would you mind pointing out the actual fix? :)

Thanks,
David

review: Needs Information

[fox91 (fox1991)]

573 is a fix for cli/wicd-cli.py and a conversion from tabs to four spaces (there was a mix!).

The fix is in these lines:

197 last = None
198 if check is not None:
199 while check():

If check is None an exception was raised (reproducible with launching the script with incorrect parameters)

[David Paleino (dpaleino)]

On Mon, 08 Aug 2011 09:22:17 -0000, fox91 wrote:

> 573 is a fix for cli/wicd-cli.py and a conversion from tabs to four spaces
> (there was a mix!).
>
> The fix is in these lines:
>
> 197 last = None
> 198 if check is not None:
> 199 while check():
>
> If check is None an exception was raised (reproducible with launching the
> script with incorrect parameters)

Ah, I see.

Would you mind making a branch with those two things (fix + tabs→spaces) fixed
in different commits? That would be cleaner for the repository history (and
easier for me, so that I can just merge your new branch).

Thank you,
David

--
 . ''`. Debian developer | http://wiki.debian.org/DavidPaleino
 : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'` GPG: 1392B174 ----|---- http://deb.li/dapal
   `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174

=== modified file 'cli/wicd-cli.py'
--- cli/wicd-cli.py	2010-05-29 09:32:34 +0000
+++ cli/wicd-cli.py	2011-07-03 18:57:27 +0000
@@ -31,17 +31,17 @@
 
 bus = dbus.SystemBus()
 try:
-	daemon = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon'),
-			'org.wicd.daemon')
-	wireless = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wireless'),
-			'org.wicd.daemon.wireless')
-	wired = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wired'),
-			'org.wicd.daemon.wired')
-	config = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/config'),
-			'org.wicd.daemon.config')
+    daemon = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon'),
+            'org.wicd.daemon')
+    wireless = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wireless'),
+            'org.wicd.daemon.wireless')
+    wired = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/wired'),
+            'org.wicd.daemon.wired')
+    config = dbus.Interface(bus.get_object('org.wicd.daemon', '/org/wicd/daemon/config'),
+            'org.wicd.daemon.config')
 except dbus.DBusException:
-	print 'Error: Could not connect to the daemon. Please make sure it is running.'
-	sys.exit(3)
+    print 'Error: Could not connect to the daemon. Please make sure it is running.'
+    sys.exit(3)
 
 parser = optparse.OptionParser()
 
@@ -67,174 +67,176 @@
 op_performed = False
 
 if not (options.wireless or options.wired):
-	print "Please use --wireless or --wired to specify " + \
-	"the type of connection to operate on."
+    print "Please use --wireless or --wired to specify " + \
+    "the type of connection to operate on."
 
 # functions
 def is_valid_wireless_network_id(network_id):
-	if not (network_id >= 0 \
-			and network_id < wireless.GetNumberOfNetworks()):
-		print 'Invalid wireless network identifier.'
-		sys.exit(1)
+    if not (network_id >= 0 \
+            and network_id < wireless.GetNumberOfNetworks()):
+        print 'Invalid wireless network identifier.'
+        sys.exit(1)
 
 def is_valid_wired_network_id(network_id):
-	num = len(wired.GetWiredProfileList())
-	if not (network_id < num and \
-			network_id >= 0):
-		print 'Invalid wired network identifier.'
-		sys.exit(4)
+    num = len(wired.GetWiredProfileList())
+    if not (network_id < num and \
+            network_id >= 0):
+        print 'Invalid wired network identifier.'
+        sys.exit(4)
 
 def is_valid_wired_network_profile(profile_name):
-	if not profile_name in wired.GetWiredProfileList():
-		print 'Profile of that name does not exist.'
-		sys.exit(5)
+    if not profile_name in wired.GetWiredProfileList():
+        print 'Profile of that name does not exist.'
+        sys.exit(5)
 
 if options.scan and options.wireless:
-	# synchronized scan
-	wireless.Scan(True)
-	op_performed = True
+    # synchronized scan
+    wireless.Scan(True)
+    op_performed = True
 
 if options.load_profile and options.wired:
-	is_valid_wired_network_profile(options.name)
-	config.ReadWiredNetworkProfile(options.name)
-	op_performed = True
+    is_valid_wired_network_profile(options.name)
+    config.ReadWiredNetworkProfile(options.name)
+    op_performed = True
 
 if options.list_networks:
-	if options.wireless:
-		print '#\tBSSID\t\t\tChannel\tESSID'
-		for network_id in range(0, wireless.GetNumberOfNetworks()):
-			print '%s\t%s\t%s\t%s' % (network_id,
-				wireless.GetWirelessProperty(network_id, 'bssid'),
-				wireless.GetWirelessProperty(network_id, 'channel'),
-				wireless.GetWirelessProperty(network_id, 'essid'))
-	elif options.wired:
-		print '#\tProfile name'
-		id = 0
-		for profile in wired.GetWiredProfileList():
-			print '%s\t%s' % (id, profile)
-			id += 1
-	op_performed = True
+    if options.wireless:
+        print '#\tBSSID\t\t\tChannel\tESSID'
+        for network_id in range(0, wireless.GetNumberOfNetworks()):
+            print '%s\t%s\t%s\t%s' % (network_id,
+                wireless.GetWirelessProperty(network_id, 'bssid'),
+                wireless.GetWirelessProperty(network_id, 'channel'),
+                wireless.GetWirelessProperty(network_id, 'essid'))
+    elif options.wired:
+        print '#\tProfile name'
+        id = 0
+        for profile in wired.GetWiredProfileList():
+            print '%s\t%s' % (id, profile)
+            id += 1
+    op_performed = True
 
 if options.network_details:
-	if options.wireless:
-		if options.network >= 0:
-			is_valid_wireless_network_id(options.network)
-			network_id = options.network
-		else:
-			network_id = wireless.GetCurrentNetworkID(0)
-			is_valid_wireless_network_id(network_id)
-			# we're connected to a network, print IP
-			print "IP: %s" % wireless.GetWirelessIP(0)
+    if options.wireless:
+        if options.network >= 0:
+            is_valid_wireless_network_id(options.network)
+            network_id = options.network
+        else:
+            network_id = wireless.GetCurrentNetworkID(0)
+            is_valid_wireless_network_id(network_id)
+            # we're connected to a network, print IP
+            print "IP: %s" % wireless.GetWirelessIP(0)
 
-		print "Essid: %s" % wireless.GetWirelessProperty(network_id, "essid")
-		print "Bssid: %s" % wireless.GetWirelessProperty(network_id, "bssid")
-		if wireless.GetWirelessProperty(network_id, "encryption"):
-			print "Encryption: On"
-			print "Encryption Method: %s" % \
-					wireless.GetWirelessProperty(network_id, "encryption_method")
-		else:
-			print "Encryption: Off"
-		print "Quality: %s" % wireless.GetWirelessProperty(network_id, "quality")
-		print "Mode: %s" % wireless.GetWirelessProperty(network_id, "mode")
-		print "Channel: %s" % wireless.GetWirelessProperty(network_id, "channel")
-		print "Bit Rates: %s" % wireless.GetWirelessProperty(network_id, "bitrates")
-	op_performed = True
+        print "Essid: %s" % wireless.GetWirelessProperty(network_id, "essid")
+        print "Bssid: %s" % wireless.GetWirelessProperty(network_id, "bssid")
+        if wireless.GetWirelessProperty(network_id, "encryption"):
+            print "Encryption: On"
+            print "Encryption Method: %s" % \
+                    wireless.GetWirelessProperty(network_id, "encryption_method")
+        else:
+            print "Encryption: Off"
+        print "Quality: %s" % wireless.GetWirelessProperty(network_id, "quality")
+        print "Mode: %s" % wireless.GetWirelessProperty(network_id, "mode")
+        print "Channel: %s" % wireless.GetWirelessProperty(network_id, "channel")
+        print "Bit Rates: %s" % wireless.GetWirelessProperty(network_id, "bitrates")
+    op_performed = True
 
 # network properties
 
 if options.network_property:
-	options.network_property = options.network_property.lower()
-	if options.wireless:
-		if options.network >= 0:
-			is_valid_wireless_network_id(options.network)
-			network_id = options.network
-		else:
-			network_id = wireless.GetCurrentNetworkID(0)
-			is_valid_wireless_network_id(network_id)
-		if not options.set_to:
-			print wireless.GetWirelessProperty(network_id, options.network_property)
-		else:
-			wireless.SetWirelessProperty(network_id, \
-					options.network_property, options.set_to)
-	elif options.wired:
-		if not options.set_to:
-			print wired.GetWiredProperty(options.network_property)
-		else:
-			wired.SetWiredProperty(options.network_property, options.set_to)
-	op_performed = True
+    options.network_property = options.network_property.lower()
+    if options.wireless:
+        if options.network >= 0:
+            is_valid_wireless_network_id(options.network)
+            network_id = options.network
+        else:
+            network_id = wireless.GetCurrentNetworkID(0)
+            is_valid_wireless_network_id(network_id)
+        if not options.set_to:
+            print wireless.GetWirelessProperty(network_id, options.network_property)
+        else:
+            wireless.SetWirelessProperty(network_id, \
+                    options.network_property, options.set_to)
+    elif options.wired:
+        if not options.set_to:
+            print wired.GetWiredProperty(options.network_property)
+        else:
+            wired.SetWiredProperty(options.network_property, options.set_to)
+    op_performed = True
 
 if options.disconnect:
-	daemon.Disconnect()
-	if options.wireless:
-		if wireless.GetCurrentNetworkID(0) > -1:
-			print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0),
-					wireless.DetectWirelessInterface())
-	elif options.wired:
-		if wired.CheckPluggedIn():
-			print "Disconnecting from wired connection on %s" % wired.DetectWiredInterface()
-	op_performed = True
+    daemon.Disconnect()
+    if options.wireless:
+        if wireless.GetCurrentNetworkID(0) > -1:
+            print "Disconnecting from %s on %s" % (wireless.GetCurrentNetwork(0),
+                    wireless.DetectWirelessInterface())
+    elif options.wired:
+        if wired.CheckPluggedIn():
+            print "Disconnecting from wired connection on %s" % wired.DetectWiredInterface()
+    op_performed = True
 
 if options.connect:
-	if options.wireless and options.network > -1:
-		is_valid_wireless_network_id(options.network)
-		name = wireless.GetWirelessProperty(options.network, 'essid')
-		encryption = wireless.GetWirelessProperty(options.network, 'enctype')
-		print "Connecting to %s with %s on %s" % (name, encryption,
-				wireless.DetectWirelessInterface())
-		wireless.ConnectWireless(options.network)
-
-		check = lambda: wireless.CheckIfWirelessConnecting()
-		message = lambda: wireless.CheckWirelessConnectingMessage()
-	elif options.wired:
-		print "Connecting to wired connection on %s" % wired.DetectWiredInterface()
-		wired.ConnectWired()
-
-		check = lambda: wired.CheckIfWiredConnecting()
-		message = lambda: wired.CheckWiredConnectingMessage()
-
-	# update user on what the daemon is doing
-	last = None
-	while check():
-		next = message()
-		if next != last:
-			# avoid a race condition where status is updated to "done" after the
-			# loop check
-			if next == "done":
-				break
-			print "%s..." % next.replace("_", " ")
-			last = next
-	print "done!"
-	op_performed = True
+    check = None
+    if options.wireless and options.network > -1:
+        is_valid_wireless_network_id(options.network)
+        name = wireless.GetWirelessProperty(options.network, 'essid')
+        encryption = wireless.GetWirelessProperty(options.network, 'enctype')
+        print "Connecting to %s with %s on %s" % (name, encryption,
+                wireless.DetectWirelessInterface())
+        wireless.ConnectWireless(options.network)
+
+        check = lambda: wireless.CheckIfWirelessConnecting()
+        message = lambda: wireless.CheckWirelessConnectingMessage()[1]
+    elif options.wired:
+        print "Connecting to wired connection on %s" % wired.DetectWiredInterface()
+        wired.ConnectWired()
+
+        check = lambda: wired.CheckIfWiredConnecting()
+        message = lambda: wired.CheckWiredConnectingMessage()
+
+    # update user on what the daemon is doing
+    last = None
+    if check is not None:
+        while check():
+            next = message()
+            if next != last:
+                # avoid a race condition where status is updated to "done" after the
+                # loop check
+                if next == "done":
+                    break
+                print "%s..." % next.replace("_", " ")
+                last = next
+        print "done!"
+        op_performed = True
 
 # pretty print optional and required properties
 def str_properties(prop):
-	if len(prop) == 0:
-		return "None"
-	else:
-		return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required'])
+    if len(prop) == 0:
+        return "None"
+    else:
+        return ', '.join("%s (%s)" % (x[0], x[1].replace("_", " ")) for x in type['required'])
 
 if options.wireless and options.list_encryption_types:
-	et = misc.LoadEncryptionMethods()
-	# print 'Installed encryption templates:'
-	print '%s\t%-20s\t%s' % ('#', 'Name', 'Description')
-	id = 0
-	for type in et:
-		print '%s\t%-20s\t%s' % (id, type['type'], type['name'])
-		print '  Req: %s' % str_properties(type['required'])
-		print '---'
-		# don't print optionals (yet)
-		#print '  Opt: %s' % str_properties(type['optional'])
-		id += 1
-	op_performed = True
+    et = misc.LoadEncryptionMethods()
+    # print 'Installed encryption templates:'
+    print '%s\t%-20s\t%s' % ('#', 'Name', 'Description')
+    id = 0
+    for type in et:
+        print '%s\t%-20s\t%s' % (id, type['type'], type['name'])
+        print '  Req: %s' % str_properties(type['required'])
+        print '---'
+        # don't print optionals (yet)
+        #print '  Opt: %s' % str_properties(type['optional'])
+        id += 1
+    op_performed = True
 
 if options.save and options.network > -1:
-	if options.wireless:
-		is_valid_wireless_network_id(options.network)
-		config.SaveWirelessNetworkProfile(options.network)
-	elif options.wired:
-		config.SaveWiredNetworkProfile(options.name)
-	op_performed = True
+    if options.wireless:
+        is_valid_wireless_network_id(options.network)
+        config.SaveWirelessNetworkProfile(options.network)
+    elif options.wired:
+        config.SaveWiredNetworkProfile(options.name)
+    op_performed = True
 
 if not op_performed:
-	print "No operations performed."
+    print "No operations performed."
 

=== modified file 'curses/wicd-curses.py'
--- curses/wicd-curses.py	2010-06-09 17:20:53 +0000
+++ curses/wicd-curses.py	2011-07-03 18:57:27 +0000
@@ -733,12 +733,9 @@
                 iwconfig = wireless.GetIwconfig()
             else:
                 iwconfig = ''
-            # set_status is rigged to return false when it is not
-            # connecting to anything, so this should work.
-            return self.set_status(wireless.GetCurrentNetwork(iwconfig) +
-                    ': ' +
-                    language[str(wireless.CheckWirelessConnectingMessage())],
-                    True)
+            essid, stat = wireless.CheckWirelessConnectingMessage()
+            return self.set_status("%s: %s" % (essid, language[str(stat)]),
+                                   True)
         if wired_connecting:
             return self.set_status( language['wired_network'] +
                     ': ' +

=== modified file 'gtk/gui.py'
--- gtk/gui.py	2010-05-29 09:32:37 +0000
+++ gtk/gui.py	2011-07-03 18:57:27 +0000
@@ -446,8 +446,9 @@
         if self.statusID:
             gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
         if info[0] == "wireless":
-            gobject.idle_add(self.set_status, str(info[1]) + ': ' +
-                   language[str(wireless.CheckWirelessConnectingMessage())])
+            essid, stat = wireless.CheckWirelessConnectingMessage()
+            gobject.idle_add(self.set_status, "%s: %s" % (essid,
+                                                          language[str(stat)]))
         elif info[0] == "wired":
             gobject.idle_add(self.set_status, language['wired_network'] + ': ' +
                          language[str(wired.CheckWiredConnectingMessage())])

=== modified file 'wicd/wicd-daemon.py'
--- wicd/wicd-daemon.py	2010-12-23 19:12:58 +0000
+++ wicd/wicd-daemon.py	2011-07-03 18:57:27 +0000
@@ -1201,8 +1201,9 @@
     def CheckWirelessConnectingMessage(self):
         """ Returns the wireless interface's status message. """
         if not self.wifi.connecting_thread == None:
+            essid = self.wifi.connecting_thread.network["essid"]
             stat = self.wifi.connecting_thread.GetStatus()
-            return stat
+            return essid, stat
         else:
             return False