From 9c7120959eddcfc4b0ee31558a7af2275cb8d119 Mon Sep 17 00:00:00 2001 From: Debasish Chowdhury Date: Sat, 30 Nov 2013 18:24:04 +0530 Subject: [PATCH] Removes unused import statements Change-Id: If229aa3f6e1009e1abfba13aba3970bdf2dd3761 closes-bug: #1255885 --- tox.ini | 2 +- troveclient/client.py | 11 ++++------- troveclient/common.py | 8 -------- troveclient/compat/cli.py | 1 - troveclient/compat/tests/test_common.py | 1 - troveclient/compat/tests/test_xml.py | 1 - troveclient/compat/utils.py | 1 - troveclient/utils.py | 1 - troveclient/v1/client.py | 9 --------- troveclient/v1/datastores.py | 6 ------ 10 files changed, 5 insertions(+), 36 deletions(-) diff --git a/tox.ini b/tox.ini index c4fbef6f..9f70615a 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' sphinx-build -b html {toxinidir}/docs/source {envtmpdir}/html [flake8] -ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H202,H23,H301,H306,H401,H402,H403,H404,H702,H703 +ignore = E125,F403,F811,F821,F841,H102,H103,H201,H202,H23,H301,H306,H401,H402,H403,H404,H702,H703 show-source = True exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build diff --git a/troveclient/client.py b/troveclient/client.py index 19bc1ef3..72536fba 100644 --- a/troveclient/client.py +++ b/troveclient/client.py @@ -25,6 +25,10 @@ from __future__ import print_function import logging import os +import requests +from troveclient.openstack.common.apiclient import exceptions +from troveclient import service_catalog +from troveclient.openstack.common.apiclient import client try: import urlparse @@ -46,13 +50,6 @@ if not hasattr(urlparse, 'parse_qsl'): import cgi urlparse.parse_qsl = cgi.parse_qsl -import requests - -from troveclient.openstack.common.apiclient import exceptions -from troveclient import service_catalog -from troveclient import utils -from troveclient.openstack.common.apiclient import client - class HTTPClient(object): diff --git a/troveclient/common.py b/troveclient/common.py index ea191aa3..a40d921b 100644 --- a/troveclient/common.py +++ b/troveclient/common.py @@ -16,14 +16,6 @@ # License for the specific language governing permissions and limitations # under the License. -import copy -import json -import optparse -import os -import pickle -import sys - -from troveclient import client from troveclient import exceptions from troveclient.openstack.common.py3kcompat import urlutils diff --git a/troveclient/compat/cli.py b/troveclient/compat/cli.py index 8dd2fb55..85489c18 100644 --- a/troveclient/compat/cli.py +++ b/troveclient/compat/cli.py @@ -342,7 +342,6 @@ COMMANDS = { def main(): # Parse arguments - import pdb load_file = True for index, arg in enumerate(sys.argv): if (arg == "auth" and len(sys.argv) > (index + 1) diff --git a/troveclient/compat/tests/test_common.py b/troveclient/compat/tests/test_common.py index 61636930..1a12258e 100644 --- a/troveclient/compat/tests/test_common.py +++ b/troveclient/compat/tests/test_common.py @@ -7,7 +7,6 @@ from testtools import TestCase from mock import Mock from troveclient.compat import common -from troveclient import client """ unit tests for common.py diff --git a/troveclient/compat/tests/test_xml.py b/troveclient/compat/tests/test_xml.py index 4f9d8525..dfae68ac 100644 --- a/troveclient/compat/tests/test_xml.py +++ b/troveclient/compat/tests/test_xml.py @@ -1,4 +1,3 @@ -from testtools import TestCase from lxml import etree #from troveclient import xml diff --git a/troveclient/compat/utils.py b/troveclient/compat/utils.py index 06d3c640..f8422fd1 100644 --- a/troveclient/compat/utils.py +++ b/troveclient/compat/utils.py @@ -13,7 +13,6 @@ # under the License. import os -import re from troveclient.openstack.common import strutils diff --git a/troveclient/utils.py b/troveclient/utils.py index 78fcc2ae..f8c30b77 100644 --- a/troveclient/utils.py +++ b/troveclient/utils.py @@ -19,7 +19,6 @@ from __future__ import print_function import os -import re import sys import uuid import simplejson as json diff --git a/troveclient/v1/client.py b/troveclient/v1/client.py index ce68ef4c..14bb02a5 100644 --- a/troveclient/v1/client.py +++ b/troveclient/v1/client.py @@ -19,23 +19,14 @@ from troveclient import client from troveclient.v1.databases import Databases from troveclient.v1.flavors import Flavors -from troveclient.v1.instances import Instances from troveclient.v1.limits import Limits from troveclient.v1.users import Users from troveclient.v1.root import Root -from troveclient.v1.hosts import Hosts -from troveclient.v1.quota import Quotas from troveclient.v1.backups import Backups from troveclient.v1.security_groups import SecurityGroups from troveclient.v1.security_groups import SecurityGroupRules from troveclient.v1.datastores import Datastores from troveclient.v1.datastores import DatastoreVersions -from troveclient.v1.storage import StorageInfo -from troveclient.v1.management import Management -from troveclient.v1.management import MgmtFlavors -from troveclient.v1.accounts import Accounts -from troveclient.v1.diagnostics import DiagnosticsInterrogator -from troveclient.v1.diagnostics import HwInfoInterrogator class Client(object): diff --git a/troveclient/v1/datastores.py b/troveclient/v1/datastores.py index 8a92d70e..fdc6b354 100644 --- a/troveclient/v1/datastores.py +++ b/troveclient/v1/datastores.py @@ -18,12 +18,6 @@ from troveclient import base -from troveclient.common import check_for_exceptions -from troveclient.common import limit_url -from troveclient.common import Paginated -from troveclient.openstack.common.apiclient import exceptions -from troveclient.openstack.common.py3kcompat import urlutils - class Datastore(base.Resource):