diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/api_proxy.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/api_proxy.py index d05f17db..61a6afac 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/api_proxy.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/api_proxy.py @@ -5,16 +5,17 @@ # SPDX-License-Identifier: Apache-2.0 # -import os -import sys -import signal import eventlet +import os +import signal +import sys from oslo_config import cfg from oslo_log import log as logging + from nova_api_proxy.common import config -from nova_api_proxy.common.service import Server from nova_api_proxy.common import histogram +from nova_api_proxy.common.service import Server LOG = logging.getLogger(__name__) diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/acceptor.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/acceptor.py index 8a83cf64..622f9c1f 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/acceptor.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/acceptor.py @@ -4,19 +4,20 @@ # SPDX-License-Identifier: Apache-2.0 # import json +from paste.request import construct_url import routes import webob.dec import webob.exc -from paste.request import construct_url from oslo_config import cfg from oslo_log import log as logging -from nova_api_proxy.common import utils + +from nova_api_proxy.apps.dispatcher import APIDispatcher +from nova_api_proxy.apps.dispatcher import Router +from nova_api_proxy.apps.proxy import Proxy from nova_api_proxy.common.service import Middleware from nova_api_proxy.common.service import Request -from nova_api_proxy.apps.dispatcher import Router -from nova_api_proxy.apps.dispatcher import APIDispatcher -from nova_api_proxy.apps.proxy import Proxy +from nova_api_proxy.common import utils LOG = logging.getLogger(__name__) diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/dispatcher.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/dispatcher.py index 99d112b0..0d1a96a9 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/dispatcher.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/dispatcher.py @@ -10,8 +10,9 @@ import webob.exc from oslo_config import cfg from oslo_log import log as proxy_log -from nova_api_proxy.common import utils + from nova_api_proxy.common.service import Middleware +from nova_api_proxy.common import utils LOG = proxy_log.getLogger(__name__) diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/proxy.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/proxy.py index 685f64a4..80e8b97b 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/proxy.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/proxy.py @@ -13,13 +13,15 @@ # import httplib -import urllib -from paste.proxy import TransparentProxy from paste.proxy import parse_headers +from paste.proxy import TransparentProxy +import urllib + from oslo_log import log as logging + +from nova_api_proxy.common import histogram from nova_api_proxy.common.service import Application from nova_api_proxy.common.timestamp import get_monotonic_timestamp_in_ms -from nova_api_proxy.common import histogram LOG = logging.getLogger(__name__) diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/histogram.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/histogram.py index f0a258a7..a657d989 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/histogram.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/histogram.py @@ -3,9 +3,9 @@ # # SPDX-License-Identifier: Apache-2.0 # -import math import array import datetime +import math from oslo_log import log as logging diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/service.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/service.py index e14c64a0..4a1eb563 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/service.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/service.py @@ -15,14 +15,16 @@ # import errno -import os import eventlet -import webob.dec -import webob.exc import eventlet.greenio import eventlet.wsgi +import os +import webob.dec +import webob.exc + from eventlet.green import socket from eventlet.green import ssl + from oslo_config import cfg from oslo_log import log as logging diff --git a/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/timestamp.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/timestamp.py index fef84409..7fb143b3 100644 --- a/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/timestamp.py +++ b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/timestamp.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import os import ctypes +import os CLOCK_MONOTONIC_RAW = 4 # from diff --git a/nova-api-proxy/tox.ini b/nova-api-proxy/tox.ini index 1353683b..d72ce7c4 100644 --- a/nova-api-proxy/tox.ini +++ b/nova-api-proxy/tox.ini @@ -25,20 +25,19 @@ commands = {posargs} # - hacking codes - # H104: File contains nothing but comments # H301: one import per line -# H306: imports not in alphabetical order # H404: multi line docstring should start without a leading new line # H405: multi line docstring summary not separated with an empty line # H501: Do not use self.__dict__ for string formatting # - flake8 codes - # F821 undefined name 'unicode' (python3 specific) ignore=E123,E127,E129 - H104,H301,H306,H404,H405,H501, + H104,H301,H404,H405,H501, F821 # H106 Don’t put vim configuration in source files (off by default). # H203 Use assertIs(Not)None to check for None (off by default). # TODO: enable: H904 Delay string interpolations at logging calls (off by default). enable-extensions = H106,H203 -max-line-length=84 +max-line-length=84 [testenv:pep8] usedevelop = False