Merge "Fix pep8 failures with hacking 2.0.0"

This commit is contained in:
Zuul 2020-01-06 16:14:49 +00:00 committed by Gerrit Code Review
commit 954ad0fdfc
7 changed files with 10 additions and 9 deletions

View File

@ -13,7 +13,7 @@
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from openstack_auth.defaults import * # noqa: F403,H303
from openstack_auth.defaults import * # noqa: F401,F403,H303
from horizon.contrib import bootstrap_datepicker

View File

@ -19,8 +19,8 @@
import os
import socket
from horizon.defaults import * # noqa: F403,H303
from openstack_auth.defaults import * # noqa: F403,H303
from horizon.defaults import * # noqa: F401,F403,H303
from openstack_auth.defaults import * # noqa: F401,F403,H303
from openstack_dashboard.utils import settings as settings_utils
socket.setdefaulttimeout(1)

View File

@ -25,10 +25,12 @@ from django.utils.text import normalize_newlines
from horizon.test import helpers as test
# The following imports are required to register the dashboards.
# NOTE(amotoki): When an import line is wrapped, noqa F401 seems not to work,
# so we don't wrap lines and ignore E501 (too long line) too.
from horizon.test.test_dashboards.cats.dashboard import Cats # noqa: F401
from horizon.test.test_dashboards.cats.kittens.panel import Kittens # noqa: F401
from horizon.test.test_dashboards.cats.kittens.panel import Kittens # noqa: F401,E501
from horizon.test.test_dashboards.dogs.dashboard import Dogs # noqa: F401
from horizon.test.test_dashboards.dogs.puppies.panel import Puppies # noqa: F401
from horizon.test.test_dashboards.dogs.puppies.panel import Puppies # noqa: F401,E501
def single_line(text):

View File

@ -18,7 +18,7 @@ from django.utils.translation import pgettext_lazy
from django.utils.translation import ugettext_lazy as _
# openstack_auth.default is imported in horizon.defaults.
from horizon.defaults import * # noqa: F403,H303
from horizon.defaults import * # noqa: F401,F403,H303
def _get_root_path():

View File

@ -274,7 +274,7 @@ if os.path.exists(LOCAL_SETTINGS_DIR_PATH):
with open(os.path.join(dirpath, filename)) as f:
# pylint: disable=exec-used
exec(f.read())
except Exception as e:
except Exception:
_LOG.exception(
"Can not exec settings snippet %s", filename)

View File

@ -145,7 +145,6 @@ def data(TEST):
'created_at': '2013-04-01 10:30:00',
'volume_type': None,
'bootable': 'false',
'bootable': False,
'attachments': [{"id": "21023e92-8008-1234-8059-7f2293ff3890",
"server_id": '1',
"device": "/dev/hda"}]})

View File

@ -7,7 +7,7 @@
# be installed in a specific order.
#
# Hacking should appear first in case something else depends on pep8
hacking>=1.1.0,<2 # Apache-2.0
hacking>=2.0.0 # Apache-2.0
#
astroid==2.1.0 # LGPLv2.1
bandit!=1.6.0,>=1.4.0 # Apache-2.0