From b53edad2546315e087e88b6ae3f49e8a861517f7 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 19 Feb 2009 17:12:01 -0500 Subject: raise exceptions in the proper form --- ipalib/plugins/f_passwd.py | 2 +- ipalib/plugins/f_user.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipalib/plugins/f_passwd.py b/ipalib/plugins/f_passwd.py index 739e6d5b1..a599276f4 100644 --- a/ipalib/plugins/f_passwd.py +++ b/ipalib/plugins/f_passwd.py @@ -54,7 +54,7 @@ class passwd(Command): if principal.find('@') > 0: u = principal.split('@') if len(u) > 2: - raise errors.InvalidUserPrincipal, principal + raise errors.InvalidUserPrincipal(principal) else: principal = principal+"@"+self.api.env.realm dn = self.Backend.ldap.find_entry_dn( diff --git a/ipalib/plugins/f_user.py b/ipalib/plugins/f_user.py index 13bc5cd01..e4e1cdaf1 100644 --- a/ipalib/plugins/f_user.py +++ b/ipalib/plugins/f_user.py @@ -160,7 +160,7 @@ class user_add(crud.Create): kw['gidnumber'] = default_group.get('gidnumber') except errors2.NotFound: # Fake an LDAP error so we can return something useful to the kw - raise errors2.NotFound, "The default group for new users, '%s', cannot be found." % config.get('ipadefaultprimarygroup') + raise errors2.NotFound("The default group for new users, '%s', cannot be found." % config.get('ipadefaultprimarygroup')) except Exception, e: # catch everything else raise e -- cgit