diff options
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rw-r--r-- | nova/openstack/common/cfg.py | 2 | ||||
| -rw-r--r-- | nova/tests/rpc/test_dispatcher.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_volume_utils.py | 8 | ||||
| -rw-r--r-- | nova/volume/manager.py | 2 | ||||
| -rw-r--r-- | nova/volume/utils.py | 2 | ||||
| -rwxr-xr-x | run_tests.sh | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 02accd5b1..7b71dab9d 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -23,8 +23,8 @@ networking and storage of vms, and compute hosts on which they run).""" import functools import re -import time import string +import time from nova import block_device from nova.compute import aggregate_states @@ -32,8 +32,8 @@ from nova.compute import instance_types from nova.compute import power_state from nova.compute import task_states from nova.compute import vm_states -from nova import crypto from nova.consoleauth import rpcapi as consoleauth_rpcapi +from nova import crypto from nova.db import base from nova import exception from nova import flags diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py index 1a167681c..153880f3b 100644 --- a/nova/openstack/common/cfg.py +++ b/nova/openstack/common/cfg.py @@ -226,8 +226,8 @@ log files: import collections import copy -import glob import functools +import glob import optparse import os import string diff --git a/nova/tests/rpc/test_dispatcher.py b/nova/tests/rpc/test_dispatcher.py index 0c16c6a34..d67f7b8ec 100644 --- a/nova/tests/rpc/test_dispatcher.py +++ b/nova/tests/rpc/test_dispatcher.py @@ -19,8 +19,8 @@ Unit Tests for rpc.dispatcher """ from nova import context -from nova.rpc import dispatcher from nova.rpc import common as rpc_common +from nova.rpc import dispatcher from nova import test diff --git a/nova/tests/test_volume_utils.py b/nova/tests/test_volume_utils.py index 453c0d925..da84dd5d2 100644 --- a/nova/tests/test_volume_utils.py +++ b/nova/tests/test_volume_utils.py @@ -17,15 +17,15 @@ """Tests For miscellaneous util methods used with volume.""" +from nova import context from nova import db from nova import flags -from nova import context -from nova import test -from nova import log as logging import nova.image.fake -from nova.volume import utils as volume_utils +from nova import log as logging from nova.notifier import test_notifier from nova.openstack.common import importutils +from nova import test +from nova.volume import utils as volume_utils LOG = logging.getLogger(__name__) diff --git a/nova/volume/manager.py b/nova/volume/manager.py index a471ea372..bed56ffff 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -48,8 +48,8 @@ from nova.openstack.common import excutils from nova.openstack.common import importutils from nova import rpc from nova import utils -from nova.volume import volume_types from nova.volume import utils as volume_utils +from nova.volume import volume_types LOG = logging.getLogger(__name__) diff --git a/nova/volume/utils.py b/nova/volume/utils.py index 94f719bf3..ccdd15a4e 100644 --- a/nova/volume/utils.py +++ b/nova/volume/utils.py @@ -18,8 +18,8 @@ from nova import flags from nova import log as logging -from nova import utils from nova.notifier import api as notifier_api +from nova import utils FLAGS = flags.FLAGS diff --git a/run_tests.sh b/run_tests.sh index 0b5a35166..aab28ed3b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -110,7 +110,7 @@ function run_pep8 { # # Until all these issues get fixed, ignore. - ignore='--ignore=N4,N306' + ignore='--ignore=N4' ${wrapper} python tools/hacking.py ${ignore} ${srcfiles} } |