Merge "Removed unused imports"

19 files changed, 0 insertions, 32 deletions

diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py
index 1b94170d..c84a6da3 100644
--- a/keystone/auth/plugins/token.py
+++ b/keystone/auth/plugins/token.py
@@ -15,7 +15,6 @@
 # under the License.
 
 
-from keystone.common import dependency
 from keystone.common import logging
 from keystone import auth
 from keystone import exception
diff --git a/keystone/auth/routers.py b/keystone/auth/routers.py
index 29b4fdcf..52466f34 100644
--- a/keystone/auth/routers.py
+++ b/keystone/auth/routers.py
@@ -15,7 +15,6 @@
 # under the License.
 
 from keystone.auth import controllers
-from keystone.common import router
 
 
 def append_v3_routers(mapper, routers):
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 7fae0497..faaed168 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -17,7 +17,6 @@
 import uuid
 
 import ldap
-from ldap import filter as ldap_filter
 
 from keystone import clean
 from keystone.common import ldap as common_ldap
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index 1b06c4db..048a0b2b 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -15,7 +15,6 @@
 # under the License.
 
 from keystone import clean
-from keystone import config
 from keystone.common import sql
 from keystone.common.sql import migration
 from keystone.common import utils
diff --git a/keystone/policy/backends/sql.py b/keystone/policy/backends/sql.py
index bc90ff92..2472c1ed 100644
--- a/keystone/policy/backends/sql.py
+++ b/keystone/policy/backends/sql.py
@@ -14,8 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import functools
-
 from keystone.common import sql
 from keystone.common.sql import migration
 from keystone import exception
diff --git a/keystone/trust/backends/kvs.py b/keystone/trust/backends/kvs.py
index 75be2b7a..fe2aaad8 100644
--- a/keystone/trust/backends/kvs.py
+++ b/keystone/trust/backends/kvs.py
@@ -18,7 +18,6 @@ An in memory implementation of the trusts API.
 only to be used for testing purposes
 """
 import copy
-import datetime
 
 
 from keystone.common import kvs
diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py
index 00183bc5..aecdbd8a 100644
--- a/keystone/trust/controllers.py
+++ b/keystone/trust/controllers.py
@@ -1,5 +1,4 @@
 import uuid
-import json
 
 from keystone import config
 from keystone import exception
@@ -7,7 +6,6 @@ from keystone import identity
 from keystone.common import controller
 from keystone.common import dependency
 from keystone.common import logging
-from keystone import exception
 from keystone.openstack.common import timeutils
 
 
diff --git a/keystone/trust/core.py b/keystone/trust/core.py
index a9a15ff7..5c4fc90f 100644
--- a/keystone/trust/core.py
+++ b/keystone/trust/core.py
@@ -19,7 +19,6 @@
 from keystone.common import dependency
 from keystone.common import logging
 from keystone.common import manager
-from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 
diff --git a/keystone/trust/routers.py b/keystone/trust/routers.py
index f4870d0e..2d4e030a 100644
--- a/keystone/trust/routers.py
+++ b/keystone/trust/routers.py
@@ -16,7 +16,6 @@
 """WSGI Routers for the Identity service."""
 
 from keystone.trust import controllers
-from keystone.common import router
 
 
 def append_v3_routers(mapper, routers):
diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py
index 279986a0..0943f8d0 100644
--- a/tests/_ldap_livetest.py
+++ b/tests/_ldap_livetest.py
@@ -25,7 +25,6 @@ from keystone import exception
 from keystone.identity.backends import ldap as identity_ldap
 from keystone import test
 
-import default_fixtures
 import test_backend_ldap
 
 
diff --git a/tests/_ldap_tls_livetest.py b/tests/_ldap_tls_livetest.py
index 8503e51a..f52b6360 100644
--- a/tests/_ldap_tls_livetest.py
+++ b/tests/_ldap_tls_livetest.py
@@ -17,17 +17,12 @@
 
 import ldap
 import ldap.modlist
-import nose.exc
-import subprocess
 
-from keystone.common import ldap as ldap_common
 from keystone import config
 from keystone import exception
-from keystone.identity.backends import ldap as identity_ldap
 from keystone import identity
 from keystone import test
 
-import default_fixtures
 import _ldap_livetest
 
 
diff --git a/tests/test_auth.py b/tests/test_auth.py
index e7817607..faf117ca 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -19,7 +19,6 @@ import uuid
 from keystone import auth
 from keystone import config
 from keystone import exception
-from keystone import identity
 from keystone.openstack.common import timeutils
 from keystone import test
 from keystone import token
diff --git a/tests/test_auth_plugin.py b/tests/test_auth_plugin.py
index fc44c53d..47080b53 100644
--- a/tests/test_auth_plugin.py
+++ b/tests/test_auth_plugin.py
@@ -16,9 +16,7 @@
 
 import uuid
 
-from keystone.common import logging
 from keystone import auth
-from keystone import config
 from keystone import exception
 from keystone import test
 
diff --git a/tests/test_backend.py b/tests/test_backend.py
index 0b562825..dc669b52 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -17,7 +17,6 @@
 import datetime
 import default_fixtures
 import uuid
-import nose.exc
 
 from keystone.catalog import core
 from keystone import config
diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py
index 6db626d8..6259abb8 100644
--- a/tests/test_backend_ldap.py
+++ b/tests/test_backend_ldap.py
@@ -14,11 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import ldap
 import uuid
 import nose.exc
 
-from keystone.common import ldap as ldap_common
 from keystone.common.ldap import fakeldap
 from keystone import config
 from keystone import exception
diff --git a/tests/test_catalog.py b/tests/test_catalog.py
index 690dde35..8a46be80 100644
--- a/tests/test_catalog.py
+++ b/tests/test_catalog.py
@@ -1,8 +1,5 @@
 import uuid
 
-from keystone.common.sql import util as sql_util
-from keystone import test
-
 import test_content_types
 
 
diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py
index 43dca920..752a1cba 100644
--- a/tests/test_ipv6.py
+++ b/tests/test_ipv6.py
@@ -16,8 +16,6 @@
 # limitations under the License.
 
 import httplib
-import os
-import ssl
 
 from keystone import config
 from keystone import test
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 2940fcf1..acca5a0a 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -14,7 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import time
 import uuid
 import webob
 
diff --git a/tests/test_v3_protection.py b/tests/test_v3_protection.py
index ea38b24c..0bf26eb8 100644
--- a/tests/test_v3_protection.py
+++ b/tests/test_v3_protection.py
@@ -15,12 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import json
 import tempfile
 import uuid
 
-import nose.exc
-
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils