Niranjan wrote: Greetings, Please find the modified patch for ipapython/adminutil.py.
I have run few tests manually like running ipa-server-install as non-root user or provide --quiet and --verbose to see if it raises ScriptError properly. Also i checked by running ipa-server-install and using CTRL-C to break and see if the KeyboardInterrupt is properly caught. Please let me know your views on this. Regards Niranjan > Niranjan wrote: > > Greetings, > > > > I would like to present patch for replacing StandardError exception > > with Exception class in ipapython/adminutil.py. Also replacing > > BaseException class with Exception class. > > > > Though the use of StandardError is many places. I would like to start > > with ipapython/adminutil.py > > > > This is my first patch. Please let me know if my approach on this is > > correct. > Could anyone have a look at this please. > > > > Regards > > Niranjan > > > From 018312f76952ea86c8c6e2396657e0531d2d61ba Mon Sep 17 00:00:00 2001 > > From: Niranjan Mallapadi <mrniran...@redhat.com> > > Date: Mon, 1 Jun 2015 09:41:05 +0530 > > Subject: [PATCH] Use Exception class instead of BaseException > > > > 1. Replace BaseException with Exception class. > > 2. Remove StandardError and use Exception class. StandError is deprecated > > (Python3) > > 3 .From python3.0 use of , is not recommended, instead > > use "as" keyword (PEP 3110) > > > > Signed-off-by: Niranjan Mallapadi <mrniran...@redhat.com> > > --- > > ipapython/admintool.py | 11 +++++++++-- > > 1 file changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/ipapython/admintool.py b/ipapython/admintool.py > > index > > d55bd18499ac427db8adc0c04096bc2aabdc2bbd..891232b9f387182ac5dbfb279a6f666805261ba1 > > 100644 > > --- a/ipapython/admintool.py > > +++ b/ipapython/admintool.py > > @@ -32,7 +32,7 @@ from ipapython import config > > from ipapython import ipa_log_manager > > > > > > -class ScriptError(StandardError): > > +class ScriptError(Exception): > > """An exception that records an error message and a return value > > """ > > def __init__(self, msg='', rval=1): > > @@ -169,13 +169,20 @@ class AdminTool(object): > > self.ask_for_options() > > self.setup_logging() > > return_value = self.run() > > - except BaseException, exception: > > + except Exception as exception: > > traceback = sys.exc_info()[2] > > error_message, return_value = self.handle_error(exception) > > if return_value: > > self.log_failure(error_message, return_value, exception, > > traceback) > > return return_value > > + except SystemExit as exception: > > + traceback = sys.exc_info()[2] > > + error_message, return_value = self.handle_error(exception) > > + if return_value: > > + self.log_failure(error_message, return_value, exception, > > + traceback) > > + return return_value > > self.log_success() > > return return_value > > > > -- > > 1.9.3 > > > > > > Removed an attachment of 322 bytes with the following headers: > > > > Content-Type: application/pgp-signature > > > -- > > Manage your subscription for the Freeipa-devel mailing list: > > https://www.redhat.com/mailman/listinfo/freeipa-devel > > Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code > > -- > Manage your subscription for the Freeipa-devel mailing list: > https://www.redhat.com/mailman/listinfo/freeipa-devel > Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
From aa74dad193a42b8d7ea1715391c461bcbad888b4 Mon Sep 17 00:00:00 2001 From: Niranjan Mallapadi <mrniran...@fedoraproject.org> Date: Wed, 10 Jun 2015 04:19:46 +0530 Subject: [PATCH] Use Exception class instead of StandardError In except clause, use of "," is not recommended (PEP 3110) Signed-off-by: Niranjan Mallapadi <mrniran...@fedoraproject.org> --- ipapython/admintool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipapython/admintool.py b/ipapython/admintool.py index d55bd18499ac427db8adc0c04096bc2aabdc2bbd..5aa1c19bb70f9d9049130d1e2a253abb4b86677b 100644 --- a/ipapython/admintool.py +++ b/ipapython/admintool.py @@ -32,7 +32,7 @@ from ipapython import config from ipapython import ipa_log_manager -class ScriptError(StandardError): +class ScriptError(Exception): """An exception that records an error message and a return value """ def __init__(self, msg='', rval=1): @@ -169,7 +169,7 @@ class AdminTool(object): self.ask_for_options() self.setup_logging() return_value = self.run() - except BaseException, exception: + except BaseException as exception: traceback = sys.exc_info()[2] error_message, return_value = self.handle_error(exception) if return_value: -- 1.9.3
pgpBEOA6w7AWI.pgp
Description: PGP signature
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code