diff options
| author | Angus Salkeld <asalkeld@redhat.com> | 2013-05-20 13:00:29 +1000 |
|---|---|---|
| committer | Angus Salkeld <asalkeld@redhat.com> | 2013-05-20 13:08:31 +1000 |
| commit | 10e247319989da9a70e1a4f37a82dcbd13877365 (patch) | |
| tree | a6fafbda978c6940dd33d1aaee3dd4a5f27f1745 | |
| parent | ae142c0ffe0c10348ef3e6ff38bbffae5cdd6f59 (diff) | |
| download | python-ceilometerclient-10e247319989da9a70e1a4f37a82dcbd13877365.tar.gz | |
Fix pep H306 (import order)
Also remove some unused imports
This is an effort to get the pep ignores to be closer to nova.
Change-Id: I35612de45084fac0ae1c96dad84bb23cfade0e4f
| -rw-r--r-- | ceilometerclient/common/utils.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/shell.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 2 | ||||
| -rw-r--r-- | tests/test_shell.py | 4 | ||||
| -rw-r--r-- | tests/utils.py | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/ceilometerclient/common/utils.py b/ceilometerclient/common/utils.py index 7b82853..f5e74c0 100644 --- a/ceilometerclient/common/utils.py +++ b/ceilometerclient/common/utils.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import errno -import hashlib import os import sys import textwrap diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 51fa32b..a9c7c58 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -23,8 +23,8 @@ from keystoneclient.v2_0 import client as ksclient import ceilometerclient from ceilometerclient import client as ceiloclient -from ceilometerclient import exc from ceilometerclient.common import utils +from ceilometerclient import exc class CeilometerShell(object): diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 1bec237..9827085 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -17,8 +17,8 @@ # under the License. from ceilometerclient.common import utils +from ceilometerclient import exc from ceilometerclient.v2 import options -import ceilometerclient.exc as exc @utils.arg('-q', '--query', metavar='<QUERY>', diff --git a/tests/test_shell.py b/tests/test_shell.py index 1448403..75b6a11 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -13,8 +13,8 @@ except ImportError: from keystoneclient.v2_0 import client as ksclient from ceilometerclient import exc +from ceilometerclient import shell as ceilometer_shell from ceilometerclient.v1 import client as v1client -import ceilometerclient.shell from tests import utils FAKE_ENV = {'OS_USERNAME': 'username', @@ -41,7 +41,7 @@ class ShellTest(utils.BaseTestCase): orig = sys.stdout try: sys.stdout = cStringIO.StringIO() - _shell = ceilometerclient.shell.CeilometerShell() + _shell = ceilometer_shell.CeilometerShell() _shell.main(argstr.split()) except SystemExit: exc_type, exc_value, exc_traceback = sys.exc_info() diff --git a/tests/utils.py b/tests/utils.py index f0026e2..d9de675 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -15,8 +15,8 @@ import copy import fixtures -import StringIO import mox +import StringIO import testtools from ceilometerclient.common import http |