diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-01 21:21:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-01 21:21:36 +0000 |
| commit | 9c48a5b011304190e02972e10c69c246ff18aca6 (patch) | |
| tree | 2a0e31ac26e08c7d3dd0313538ad9c879823863d | |
| parent | 4d0543f934f05cd48002f40629a1b1f44357f6c7 (diff) | |
| parent | 8ee84ca8ea1ba3016cc4e2eaae7690c7e5468e17 (diff) | |
| download | osprofiler-9c48a5b011304190e02972e10c69c246ff18aca6.tar.gz | |
Merge "Fix import order"
| -rw-r--r-- | osprofiler/cmd/shell.py | 3 | ||||
| -rw-r--r-- | osprofiler/tests/test_opts.py | 1 | ||||
| -rw-r--r-- | osprofiler/tests/test_profiler.py | 2 | ||||
| -rw-r--r-- | osprofiler/tests/test_sqlalchemy.py | 1 | ||||
| -rw-r--r-- | osprofiler/tests/test_web.py | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/osprofiler/cmd/shell.py b/osprofiler/cmd/shell.py index 755217c..f48f23b 100644 --- a/osprofiler/cmd/shell.py +++ b/osprofiler/cmd/shell.py @@ -18,11 +18,10 @@ Command-line interface to the OpenStack Profiler. """ +import argparse import inspect import sys -import argparse - from oslo_config import cfg import osprofiler diff --git a/osprofiler/tests/test_opts.py b/osprofiler/tests/test_opts.py index 1997b98..c5963b9 100644 --- a/osprofiler/tests/test_opts.py +++ b/osprofiler/tests/test_opts.py @@ -15,6 +15,7 @@ import mock from oslo_config import fixture + from osprofiler import opts from osprofiler.tests import test diff --git a/osprofiler/tests/test_profiler.py b/osprofiler/tests/test_profiler.py index 88b96d1..87b3eea 100644 --- a/osprofiler/tests/test_profiler.py +++ b/osprofiler/tests/test_profiler.py @@ -16,9 +16,9 @@ import collections import copy import datetime -import mock import re +import mock import six from osprofiler import profiler diff --git a/osprofiler/tests/test_sqlalchemy.py b/osprofiler/tests/test_sqlalchemy.py index 83ada93..7534511 100644 --- a/osprofiler/tests/test_sqlalchemy.py +++ b/osprofiler/tests/test_sqlalchemy.py @@ -14,6 +14,7 @@ # under the License. import contextlib + import mock from osprofiler import sqlalchemy diff --git a/osprofiler/tests/test_web.py b/osprofiler/tests/test_web.py index 7355ae2..24b3906 100644 --- a/osprofiler/tests/test_web.py +++ b/osprofiler/tests/test_web.py @@ -18,9 +18,8 @@ from webob import response as webob_response from osprofiler import _utils as utils from osprofiler import profiler -from osprofiler import web - from osprofiler.tests import test +from osprofiler import web def dummy_app(environ, response): |