changeset 8989 | 8742f4bf029f |
parent 8922 | 715b9eec6da9 |
child 9461 | fc3b8798737c |
--- a/server/sources/ldapfeed.py Fri May 24 15:10:50 2013 +0200 +++ b/server/sources/ldapfeed.py Thu May 23 17:32:56 2013 +0200 @@ -20,7 +20,8 @@ import ldap from ldap.filter import filter_format -from cubicweb.cwconfig import merge_options +from logilab.common.configuration import merge_options + from cubicweb.server.sources import datafeed from cubicweb.server import ldaputils, utils from cubicweb import Binary