diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py index 6867035eb3..52571518f4 100644 --- a/keystone/assignment/backends/ldap.py +++ b/keystone/assignment/backends/ldap.py @@ -570,7 +570,7 @@ class RoleApi(common_ldap.BaseLdap): try: roles = self._ldap_get_list(project_subtree, ldap.SCOPE_SUBTREE, query_params={ - self.member_attribute: user_dn}) + self.member_attribute: user_dn}) except ldap.NO_SUCH_OBJECT: roles = [] res = [] diff --git a/keystone/notifications.py b/keystone/notifications.py index 47c014268a..3f0966aa8b 100644 --- a/keystone/notifications.py +++ b/keystone/notifications.py @@ -154,9 +154,8 @@ def notify_event_callbacks(service, resource_type, operation, payload): 'operation': operation, 'payload': payload} LOG.debug(_('Invoking callback %(cb_name)s for event ' - '%(service)s %(resource_type)s %(operation)s for' - '%(payload)s'), - subst_dict) + '%(service)s %(resource_type)s %(operation)s for' + '%(payload)s'), subst_dict) cb(service, resource_type, operation, payload) diff --git a/keystone/tests/test_notifications.py b/keystone/tests/test_notifications.py index c786b2b116..bf39ebfbe7 100644 --- a/keystone/tests/test_notifications.py +++ b/keystone/tests/test_notifications.py @@ -416,8 +416,8 @@ class TestEventCallbacks(test_v3.RestfulTestCase): def foo_callback(self, service, resource_type, operation, payload): - callback_called.append(True) # uses callback_called - # from the closure + # uses callback_called from the closure + callback_called.append(True) Foo() project_ref = self.new_project_ref(domain_id=self.domain_id)