Merge "fixed several pep8 issues"

This commit is contained in:
Jenkins 2014-06-10 22:09:28 +00:00 committed by Gerrit Code Review
commit 8de4ffab36
3 changed files with 5 additions and 6 deletions

View File

@ -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 = []

View File

@ -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)

View File

@ -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)