diff --git a/.pylintrc b/.pylintrc index 5c0fe878fe..1e38b01b65 100644 --- a/.pylintrc +++ b/.pylintrc @@ -81,7 +81,6 @@ disable= too-many-nested-blocks, too-many-return-statements, too-many-statements, - trailing-comma-tuple, useless-object-inheritance [Basic] diff --git a/horizon/management/commands/pull_catalog.py b/horizon/management/commands/pull_catalog.py index 5eb530c4d1..e231477b9d 100644 --- a/horizon/management/commands/pull_catalog.py +++ b/horizon/management/commands/pull_catalog.py @@ -23,7 +23,7 @@ ZANATA_LOCALES_URL = ("https://translate.openstack.org/rest/project" DOMAINS = ['django', 'djangojs'] MODULES = ['horizon', 'openstack_dashboard'] PROJECT = 'horizon' -BRANCH = 'master', +BRANCH = 'master' POFILE = "{module}/locale/{locale}/LC_MESSAGES/{domain}.po" POFILE_URL = ("https://translate.openstack.org/rest/file/translation/{project}" "/{branch}/{language}/po?docId={module}%2Flocale%2F{domain}") diff --git a/openstack_dashboard/dashboards/identity/projects/tables.py b/openstack_dashboard/dashboards/identity/projects/tables.py index 6e4884add9..1f4e9b3c27 100644 --- a/openstack_dashboard/dashboards/identity/projects/tables.py +++ b/openstack_dashboard/dashboards/identity/projects/tables.py @@ -180,7 +180,7 @@ class DeleteTenantsAction(policy.PolicyTargetMixin, tables.DeleteAction): ) policy_rules = (("identity", "identity:delete_project"),) - policy_target_attrs = ("target.project.domain_id", "domain_id"), + policy_target_attrs = (("target.project.domain_id", "domain_id"),) def allowed(self, request, project): if api.keystone.is_multi_domain_enabled() \