IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded python-ldap imports

Browse Source 
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
This commit is contained in:
Petr Viktorin 2013-01-31 09:02:01 -05:00 committed by Martin Kosek
parent 664248d5b8
commit cf4b52111d
4 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipa-client/ipaclient/ipadiscovery.py
View File

@ -20,8 +20,6 @@
import socket import socket
import os import os
import tempfile import tempfile
import ldap
from ldap import LDAPError
from ipapython.ipa_log_manager import root_logger from ipapython.ipa_log_manager import root_logger
from dns import resolver, rdatatype from dns import resolver, rdatatype

8
ipalib/plugins/automount.py
View File

@ -18,13 +18,13 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
from ipalib import api, errors from ipalib import api, errors
from ipalib import Object, Command from ipalib import Object, Command
from ipalib import Flag, Str, IA5Str from ipalib import Flag, Str, IA5Str
from ipalib.plugins.baseldap import * from ipalib.plugins.baseldap import *
from ipalib import _, ngettext from ipalib import _, ngettext
import ldap as _ldap
import os
__doc__ = _(""" __doc__ = _("""
Automount Automount
@ -726,8 +726,8 @@ class automountkey(LDAPObject):
('cn', parent_keys[0]), self.container_dn, ('cn', parent_keys[0]), self.container_dn,
api.env.basedn) api.env.basedn)
attrs_list = ['*'] attrs_list = ['*']
(entries, truncated) = ldap.find_entries(sfilter, attrs_list, entries, truncated = ldap.find_entries(
basedn, _ldap.SCOPE_ONELEVEL) sfilter, attrs_list, basedn, ldap.SCOPE_ONELEVEL)
if len(entries) > 1: if len(entries) > 1:
raise errors.NotFound(reason=_('More than one entry with key %(key)s found, use --info to select specific entry.') % dict(key=pkey)) raise errors.NotFound(reason=_('More than one entry with key %(key)s found, use --info to select specific entry.') % dict(key=pkey))
if truncated: if truncated:

11
ipalib/plugins/migration.py
View File

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import re import re
import ldap as _ldap
from ipalib import api, errors, output from ipalib import api, errors, output
from ipalib import Command, Password, Str, Flag, StrEnum, DNParam from ipalib import Command, Password, Str, Flag, StrEnum, DNParam
@ -286,7 +285,7 @@ def _update_default_group(ldap, pkey, config, ctx, force):
searchfilter = "(&(objectclass=posixAccount)(!(memberof=%s)))" % group_dn searchfilter = "(&(objectclass=posixAccount)(!(memberof=%s)))" % group_dn
try: try:
(result, truncated) = ldap.find_entries(searchfilter, (result, truncated) = ldap.find_entries(searchfilter,
[''], api.env.container_user, scope=_ldap.SCOPE_SUBTREE, [''], api.env.container_user, scope=ldap.SCOPE_SUBTREE,
time_limit = -1) time_limit = -1)
except errors.NotFound: except errors.NotFound:
return return
@ -701,9 +700,9 @@ can use their Kerberos accounts.''')
failed[ldap_obj_name] = {} failed[ldap_obj_name] = {}
try: try:
(entries, truncated) = ds_ldap.find_entries( entries, truncated = ds_ldap.find_entries(
search_filter, ['*'], search_bases[ldap_obj_name], search_filter, ['*'], search_bases[ldap_obj_name],
_ldap.SCOPE_ONELEVEL, ds_ldap.SCOPE_ONELEVEL,
time_limit=0, size_limit=-1, time_limit=0, size_limit=-1,
search_refs=True # migrated DS may contain search references search_refs=True # migrated DS may contain search references
) )
@ -872,9 +871,9 @@ can use their Kerberos accounts.''')
if not ds_base_dn: if not ds_base_dn:
# retrieve base DN from remote LDAP server # retrieve base DN from remote LDAP server
(entries, truncated) = ds_ldap.find_entries( entries, truncated = ds_ldap.find_entries(
'', ['namingcontexts', 'defaultnamingcontext'], DN(''), '', ['namingcontexts', 'defaultnamingcontext'], DN(''),
_ldap.SCOPE_BASE, size_limit=-1, time_limit=0, ds_ldap.SCOPE_BASE, size_limit=-1, time_limit=0,
) )
if 'defaultnamingcontext' in entries[0][1]: if 'defaultnamingcontext' in entries[0][1]:
ds_base_dn = DN(entries[0][1]['defaultnamingcontext'][0]) ds_base_dn = DN(entries[0][1]['defaultnamingcontext'][0])

38
tests/test_install/test_updates.py
View File

@ -22,9 +22,9 @@ Test the `ipaserver/install/ldapupdate.py` module.
import unittest import unittest
import os import os
import ldap
import nose import nose
from ipalib import api from ipalib import api
from ipalib import errors from ipalib import errors
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax
@ -89,11 +89,11 @@ class test_update(unittest.TestCase):
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.container_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
def test_1_add(self): def test_1_add(self):
""" """
@ -104,7 +104,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.container_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
@ -115,7 +115,7 @@ class test_update(unittest.TestCase):
self.assertEqual(entry.single_value('cn'), 'test') self.assertEqual(entry.single_value('cn'), 'test')
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
@ -137,7 +137,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
self.assertEqual(entry.single_value('gecos'), 'Test User') self.assertEqual(entry.single_value('gecos'), 'Test User')
@ -150,7 +150,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
self.assertEqual(entry.single_value('gecos'), 'Test User New') self.assertEqual(entry.single_value('gecos'), 'Test User New')
@ -163,7 +163,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
self.assertEqual(entry.single_value('gecos'), 'Test User New2') self.assertEqual(entry.single_value('gecos'), 'Test User New2')
@ -176,7 +176,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
self.assertEqual(sorted(entry.get('cn')), sorted(['Test User', 'Test User New'])) self.assertEqual(sorted(entry.get('cn')), sorted(['Test User', 'Test User New']))
@ -189,7 +189,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
self.assertEqual(sorted(entry.get('cn')), sorted(['Test User'])) self.assertEqual(sorted(entry.get('cn')), sorted(['Test User']))
@ -202,7 +202,7 @@ class test_update(unittest.TestCase):
self.assertFalse(modified) self.assertFalse(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
self.assertEqual(sorted(entry.get('cn')), sorted(['Test User'])) self.assertEqual(sorted(entry.get('cn')), sorted(['Test User']))
@ -221,11 +221,11 @@ class test_update(unittest.TestCase):
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.container_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
def test_8_badsyntax(self): def test_8_badsyntax(self):
""" """
@ -251,11 +251,11 @@ class test_update(unittest.TestCase):
# First make sure we're clean # First make sure we're clean
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.container_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
update = { update = {
@ -288,7 +288,7 @@ class test_update(unittest.TestCase):
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.container_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
@ -299,7 +299,7 @@ class test_update(unittest.TestCase):
self.assertEqual(entry.single_value('cn'), 'test') self.assertEqual(entry.single_value('cn'), 'test')
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 1)
entry = entries[0] entry = entries[0]
@ -330,8 +330,8 @@ class test_update(unittest.TestCase):
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.container_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])
with self.assertRaises(errors.NotFound): with self.assertRaises(errors.NotFound):
entries = self.ld.get_entries( entries = self.ld.get_entries(
self.user_dn, ldap.SCOPE_BASE, 'objectclass=*', ['*']) self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*'])