Merge lp:~nacl/wicd/1.6-access-denied into lp:wicd/1.6

[Andrew Psaltis]

[Andrew Psaltis (nacl)]

This resolves bug 333867, although at the moment, I am not too sure about the message in the dialog that wicd-client generates. I wasn't too sure if it should be much like the one I stuck into wicd-curses: "wicd-curses was denied access to the wicd daemon, please check that your user is in the group '%WICDGROUP%'."

[lp:~nacl/wicd/1.6-access-denied]

421. By Andrew Psaltis on 2009-06-20

Use the ANSI escape sequences to print colors instead of fetching them using tput(1) in wicd-curses.

422. By Andrew Psaltis on 2009-06-20

Made the wicd-curses "access denied" string translatable, and updated wicd-curses.py to use it.

[Robby Workman (rworkman)]

Looks good to me, but to be nitpicky:
"wicd-curses was denied access to the wicd daemon: please check that your user is in the '%WICDGROUP%' group."

review: Approve

[Dan O'Reilly (oreilldf)]

The "except Exception as e" is new in Python 2.6. We have to be 2.5 compatible.

review: Needs Fixing

[Dan O'Reilly (oreilldf)]

Also, you should use the subprocess module (subprocess.call() would probably work here) instead of os.system().

[lp:~nacl/wicd/1.6-access-denied]

423. By Andrew Psaltis on 2009-06-21

Restore python 2.5 compatibility in both clients.

[Andrew Psaltis (nacl)]

Robby: The text has been changed in the translator.

Dan: I made the fix to restore python 2.5 compatibility. Also, I no longer use os.system() in wicd-curses, the diff here just doesn't show it.

[Adam Blackburn (adamblackburn)]

Looks like the above issues are fixed, approved.

=== modified file 'curses/wicd-curses.py'
--- curses/wicd-curses.py	2009-06-05 02:19:33 +0000
+++ curses/wicd-curses.py	2009-06-19 22:48:39 +0000
@@ -38,7 +38,6 @@
 import warnings 
 warnings.filterwarnings("ignore","The popen2 module is deprecated.  Use the subprocess module.") 
 # UI stuff
-# This library is the only reason why I wrote this program.
 import urwid
 
 # DBus communication stuff
@@ -64,6 +63,7 @@
 from netentry_curses import WirelessSettingsDialog, WiredSettingsDialog,AdvancedSettingsDialog
 
 from optparse import OptionParser
+from os import system
 
 # Stuff about getting the script configurer running
 #from grp import getgrgid
@@ -72,7 +72,7 @@
 #import logging
 #import logging.handler
 
-CURSES_REVNO=wpath.curses_revision
+CURSES_REV=wpath.curses_revision
 
 # Fix strings in wicd-curses
 from wicd.translations import language
@@ -1047,7 +1047,17 @@
 ##### MAIN ENTRY POINT
 ########################################
 if __name__ == '__main__':
-    parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello()))
+    try:
+        parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()))
+    except Exception as e:
+        if "DBus.Error.AccessDenied" in e.get_dbus_name():
+            print ""
+            system("\
+echo ERROR: wicd-curses was denied access to the wicd daemon, please check that \
+your user is in the group \\'$(tput bold)$(tput setaf 4)"+ wpath.wicd_group+"$(tput sgr0)\\'.")
+            sys.exit(1)
+        else:
+            raise
     parser.set_defaults(screen='raw',debug=False)
     parser.add_option("-r", "--raw-screen",action="store_const",const='raw'
             ,dest='screen',help="use urwid's raw screen controller (default)")

=== modified file 'wicd/wicd-client.py'
--- wicd/wicd-client.py	2009-05-22 19:43:14 +0000
+++ wicd/wicd-client.py	2009-06-19 22:59:30 +0000
@@ -86,9 +86,10 @@
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except DBusException, e:
-            if "DBus.Error.AccessDenied" in e:
+        except DBusException as e:
+            if e.get_dbus_name() != None and "DBus.Error.AccessDenied" in e.get_dbus_name():
                 error(None, language['access_denied'])
+                #raise
                 raise DBusException(e)
             else:
                 print "warning: ignoring exception %s" % e