From 0211c76cd0ce614b9c7510315dbadf5336667410 Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Wed, 28 Jan 2009 23:21:17 -0700 Subject: Fixed some of the test_xmlrpc unit tests --- ipaserver/plugins/b_ldap.py | 2 +- ipaserver/servercore.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ipaserver') diff --git a/ipaserver/plugins/b_ldap.py b/ipaserver/plugins/b_ldap.py index 20fd01ec..c1262f52 100644 --- a/ipaserver/plugins/b_ldap.py +++ b/ipaserver/plugins/b_ldap.py @@ -26,7 +26,7 @@ This wraps the python-ldap bindings. import ldap as _ldap from ipalib import api -from ipalib import errors +from ipalib import errors2 from ipalib.crud import CrudBackend from ipaserver import servercore, ipaldap import krbV diff --git a/ipaserver/servercore.py b/ipaserver/servercore.py index c97148b3..6c5dccc1 100644 --- a/ipaserver/servercore.py +++ b/ipaserver/servercore.py @@ -270,7 +270,7 @@ def search(base, filter, attributes, timelimit=1, sizelimit=3000): results = context.ldap.conn.getListAsync(base, ldap.SCOPE_SUBTREE, filter, attributes, 0, None, None, timelimit, sizelimit) except ldap.NO_SUCH_OBJECT: - raise errors2.NotFound + raise errors2.NotFound() counter = results[0] entries = [counter] @@ -317,7 +317,7 @@ def get_ipa_config(): config = get_sub_entry("cn=etc," + api.env.basedn, searchfilter) except ldap.NO_SUCH_OBJECT, e: # FIXME - raise errors2.NotFound + raise errors2.NotFound() return config @@ -409,12 +409,12 @@ def add_member_to_group(member_dn, group_dn, memberattr='member'): group = get_entry_by_dn(group_dn, None) if group is None: - raise errors2.NotFound + raise errors2.NotFound() # check to make sure member_dn exists member_entry = get_base_entry(member_dn, "(objectClass=*)", ['dn','objectclass']) if not member_entry: - raise errors2.NotFound + raise errors2.NotFound() # Add the new member to the group member attribute members = group.get(memberattr, []) @@ -433,7 +433,7 @@ def remove_member_from_group(member_dn, group_dn, memberattr='member'): group = get_entry_by_dn(group_dn, None) if group is None: - raise errors2.NotFound + raise errors2.NotFound() """ if group.get('cn') == "admins": member = get_entry_by_dn(member_dn, ['dn','uid']) -- cgit