From 4240509ebf92e53041cb8eb971802aa4d3ad8d70 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 7 Sep 2011 20:31:05 +0200 Subject: samba-tool: Avoid use of "except .. as" construction introduced in python2.6. Autobuild-User: Jelmer Vernooij Autobuild-Date: Thu Sep 8 00:34:22 CEST 2011 on sn-devel-104 --- source4/scripting/bin/samba-tool | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool index c24c0e38db..7d662308a2 100755 --- a/source4/scripting/bin/samba-tool +++ b/source4/scripting/bin/samba-tool @@ -23,7 +23,8 @@ import sys sys.path.insert(0, "bin/python") from samba import netcmd -from samba.netcmd import Command, CommandError, Option +from samba.netcmd import Command, CommandError + class MainCommand(Command): """Main class for samba tool commands""" @@ -73,5 +74,5 @@ if __name__ == '__main__': try: retval = cmd._run("samba-tool", command, *args) sys.exit(retval) - except Exception as e: + except Exception, e: cmd.show_command_error(e) -- cgit