# HG changeset patch # User Sylvain Thénault # Date 1476885510 -7200 # Node ID 6f303125bfc85ffac6de0bfb41fc5327fce46e28 # Parent 809407cbff11387f10cd067dac8b913858b074bb [ldapfeed] Use new MetadataGenerator api instead of deprecated MetaGenerator diff -r 809407cbff11 -r 6f303125bfc8 cubicweb/sobjects/ldapparser.py --- a/cubicweb/sobjects/ldapparser.py Wed Oct 19 10:21:12 2016 +0200 +++ b/cubicweb/sobjects/ldapparser.py Wed Oct 19 15:58:30 2016 +0200 @@ -31,17 +31,17 @@ from cubicweb.dataimport import stores, importer -class UserMetaGenerator(stores.MetaGenerator): +class UserMetaGenerator(stores.MetadataGenerator): """Specific metadata generator, used to see newly created user into their initial state. """ @cached - def base_etype_dicts(self, entity): - entity, rels = super(UserMetaGenerator, self).base_etype_dicts(entity) - if entity.cw_etype == 'CWUser': + def base_etype_rels(self, etype): + rels = super(UserMetaGenerator, self).base_etype_rels(etype) + if etype == 'CWUser': wf_state = self._cnx.execute('Any S WHERE ET default_workflow WF, ET name %(etype)s, ' - 'WF initial_state S', {'etype': entity.cw_etype}).one() + 'WF initial_state S', {'etype': etype}).one() rels['in_state'] = wf_state.eid - return entity, rels + return rels class DataFeedLDAPAdapter(datafeed.DataFeedParser):