Merge "Fix incorrect usage of '# flake8: noqa'"

This commit is contained in:
Zuul 2018-11-27 03:59:50 +00:00 committed by Gerrit Code Review
commit 08bf770055

@ -20,12 +20,12 @@ import six
if six.PY2: if six.PY2:
gettext.install('neutron', unicode=1) # pylint: disable=unexpected-keyword-arg # pylint: disable=unexpected-keyword-arg
gettext.install('neutron', unicode=1)
else: else:
gettext.install('neutron') gettext.install('neutron')
# flake8: noqa
six.moves.builtins.__dict__['_'] = removals.remove( six.moves.builtins.__dict__['_'] = removals.remove(
message='Builtin _ translation function is deprecated in OpenStack; ' message='Builtin _ translation function is deprecated in OpenStack; '
'use the function from _i18n module for your project.')(_) 'use the function from _i18n module for your project.')(_) # noqa