From d364f2576552025ea6f7b45f0e567f5dd45eee51 Mon Sep 17 00:00:00 2001 From: Cao Xuan Hoang Date: Fri, 13 Apr 2018 14:43:44 +0700 Subject: [PATCH] Fix pep8 errors Pep8 job is broken due to recent pep8 upgrade and corresponding pycodestyle update. This commit fixes the following errors: - E402 module level import not at top of file Change-Id: Ibb444748d8797631394c1f4ee6176363eb69eb05 --- doc/source/conf.py | 3 ++- neutron_vpnaas_dashboard/test/settings.py | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 32acffc..33ed074 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -29,6 +29,8 @@ import sys import django +import neutron_vpnaas_dashboard.version + PROJECT = 'neutron-vpnaas-dashboard' BASE_DIR = os.path.dirname(os.path.abspath(__file__)) ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", "..")) @@ -39,7 +41,6 @@ sys.path.insert(0, ROOT) os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'neutron_vpnaas_dashboard.test.settings') -import neutron_vpnaas_dashboard.version django.setup() diff --git a/neutron_vpnaas_dashboard/test/settings.py b/neutron_vpnaas_dashboard/test/settings.py index ed1657f..0670183 100644 --- a/neutron_vpnaas_dashboard/test/settings.py +++ b/neutron_vpnaas_dashboard/test/settings.py @@ -13,6 +13,10 @@ # Default to Horizons test settings to avoid any missing keys from horizon.test.settings import * # noqa from openstack_dashboard.test.settings import * # noqa +import openstack_dashboard.enabled +from openstack_dashboard.utils import settings + +import neutron_vpnaas_dashboard.enabled # pop these keys to avoid log warnings about deprecation # update_dashboards will populate them anyway @@ -20,11 +24,6 @@ HORIZON_CONFIG.pop('dashboards', None) HORIZON_CONFIG.pop('default_dashboard', None) # Update the dashboards with neutron_vpnaas_dashboard -import openstack_dashboard.enabled -from openstack_dashboard.utils import settings - -import neutron_vpnaas_dashboard.enabled - settings.update_dashboards( [ openstack_dashboard.enabled,