From 252b6e423d5303402a84f69b7e2e1e629dd171df Mon Sep 17 00:00:00 2001 From: Eric Guo Date: Fri, 17 Jan 2014 20:13:24 +0800 Subject: [PATCH] Adjust import items according to hacking import rule This patch adjust import items and add missing blank lines acording to http://docs.openstack.org/developer/hacking/#imports {{stdlib imports in human alphabetical order}} \n {{third-party lib imports in human alphabetical order}} \n {{project imports in human alphabetical order}} \n \n {{begin your code}} hacking project also enforce some checks for import group. Let make the change in keytoneclient Change-Id: Ic83bd5ee426905588f4a2d555851a9a01fc69f02 --- doc/source/conf.py | 2 ++ keystoneclient/client.py | 1 + keystoneclient/discover.py | 2 ++ keystoneclient/generic/client.py | 2 ++ keystoneclient/generic/shell.py | 3 ++- keystoneclient/httpclient.py | 1 + keystoneclient/middleware/auth_token.py | 1 + keystoneclient/session.py | 1 + keystoneclient/shell.py | 4 ++-- keystoneclient/tests/test_auth_token_middleware.py | 4 ++-- keystoneclient/tests/test_discovery.py | 1 + keystoneclient/tests/test_http.py | 4 +++- keystoneclient/tests/test_https.py | 2 +- keystoneclient/tests/test_keyring.py | 1 + keystoneclient/tests/v2_0/test_access.py | 1 + keystoneclient/tests/v2_0/utils.py | 1 + keystoneclient/tests/v3/test_access.py | 1 + keystoneclient/tests/v3/utils.py | 1 + keystoneclient/v2_0/client.py | 1 + keystoneclient/v3/client.py | 1 + 20 files changed, 28 insertions(+), 7 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index c1d68b824..354d08ce3 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -16,8 +16,10 @@ from __future__ import unicode_literals import os import sys + import pbr.version + sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) diff --git a/keystoneclient/client.py b/keystoneclient/client.py index 72620eb54..832e3fa7b 100644 --- a/keystoneclient/client.py +++ b/keystoneclient/client.py @@ -15,6 +15,7 @@ from keystoneclient import discover from keystoneclient import httpclient + # Using client.HTTPClient is deprecated. Use httpclient.HTTPClient instead. HTTPClient = httpclient.HTTPClient diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py index f55a3c91d..e79432112 100644 --- a/keystoneclient/discover.py +++ b/keystoneclient/discover.py @@ -13,6 +13,7 @@ # under the License. import logging + import six from keystoneclient import exceptions @@ -20,6 +21,7 @@ from keystoneclient import httpclient from keystoneclient.v2_0 import client as v2_client from keystoneclient.v3 import client as v3_client + _logger = logging.getLogger(__name__) diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py index c0f2b5fea..bd0c50918 100644 --- a/keystoneclient/generic/client.py +++ b/keystoneclient/generic/client.py @@ -16,11 +16,13 @@ # under the License. import logging + from six.moves.urllib import parse as urlparse from keystoneclient import exceptions from keystoneclient import httpclient + _logger = logging.getLogger(__name__) diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py index 2440821c0..c8cf3521a 100644 --- a/keystoneclient/generic/shell.py +++ b/keystoneclient/generic/shell.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from keystoneclient.generic import client from keystoneclient import utils -import six CLIENT_CLASS = client.Client diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 2cfee84b5..f509d3754 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -22,6 +22,7 @@ OpenStack Client interface. Handles the REST calls and responses. """ import logging + from six.moves.urllib import parse as urlparse try: diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index ade945b81..53a136ded 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -164,6 +164,7 @@ from keystoneclient.openstack.common import memorycache from keystoneclient.openstack.common import timeutils from keystoneclient import utils + CONF = None # to pass gate before oslo-config is deployed everywhere, # try application copies first diff --git a/keystoneclient/session.py b/keystoneclient/session.py index 9ec595118..aa878d024 100644 --- a/keystoneclient/session.py +++ b/keystoneclient/session.py @@ -20,6 +20,7 @@ import six from keystoneclient import exceptions from keystoneclient.openstack.common import jsonutils + USER_AGENT = 'python-keystoneclient' _logger = logging.getLogger(__name__) diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py index 4892248fd..d78f384a4 100644 --- a/keystoneclient/shell.py +++ b/keystoneclient/shell.py @@ -28,11 +28,11 @@ import argparse import getpass import logging import os -import six import sys -import keystoneclient +import six +import keystoneclient from keystoneclient import access from keystoneclient.contrib.bootstrap import shell as shell_bootstrap from keystoneclient import exceptions as exc diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index c463e51ad..48d58ef24 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -16,20 +16,20 @@ import calendar import datetime -import iso8601 import os import shutil import stat import sys import tempfile -import testtools import time import uuid import fixtures import httpretty +import iso8601 import mock import testresources +import testtools import webob from keystoneclient.common import cms diff --git a/keystoneclient/tests/test_discovery.py b/keystoneclient/tests/test_discovery.py index 2a3e7e8ed..516c746a1 100644 --- a/keystoneclient/tests/test_discovery.py +++ b/keystoneclient/tests/test_discovery.py @@ -23,6 +23,7 @@ from keystoneclient.tests import utils from keystoneclient.v2_0 import client as v2_client from keystoneclient.v3 import client as v3_client + BASE_HOST = 'http://keystone.example.com' BASE_URL = "%s:5000/" % BASE_HOST UPDATED = '2013-03-06T00:00:00Z' diff --git a/keystoneclient/tests/test_http.py b/keystoneclient/tests/test_http.py index 85bdc68a2..a5110a4ab 100644 --- a/keystoneclient/tests/test_http.py +++ b/keystoneclient/tests/test_http.py @@ -14,8 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. -import httpretty import logging + +import httpretty import six from testtools import matchers @@ -24,6 +25,7 @@ from keystoneclient import httpclient from keystoneclient import session from keystoneclient.tests import utils + RESPONSE_BODY = '{"hi": "there"}' diff --git a/keystoneclient/tests/test_https.py b/keystoneclient/tests/test_https.py index b4a955ba3..ee47e85c8 100644 --- a/keystoneclient/tests/test_https.py +++ b/keystoneclient/tests/test_https.py @@ -13,13 +13,13 @@ # under the License. import mock - import requests from keystoneclient import httpclient from keystoneclient import session from keystoneclient.tests import utils + FAKE_RESPONSE = utils.TestResponse({ "status_code": 200, "text": '{"hi": "there"}', diff --git a/keystoneclient/tests/test_keyring.py b/keystoneclient/tests/test_keyring.py index a44d432eb..f5d23b86c 100644 --- a/keystoneclient/tests/test_keyring.py +++ b/keystoneclient/tests/test_keyring.py @@ -28,6 +28,7 @@ try: except ImportError: keyring = None + PROJECT_SCOPED_TOKEN = client_fixtures.PROJECT_SCOPED_TOKEN # These mirror values from PROJECT_SCOPED_TOKEN diff --git a/keystoneclient/tests/v2_0/test_access.py b/keystoneclient/tests/v2_0/test_access.py index 6aacf2d8a..ea2428ec1 100644 --- a/keystoneclient/tests/v2_0/test_access.py +++ b/keystoneclient/tests/v2_0/test_access.py @@ -22,6 +22,7 @@ from keystoneclient.tests import client_fixtures as token_data from keystoneclient.tests.v2_0 import client_fixtures from keystoneclient.tests.v2_0 import utils + UNSCOPED_TOKEN = client_fixtures.UNSCOPED_TOKEN PROJECT_SCOPED_TOKEN = client_fixtures.PROJECT_SCOPED_TOKEN diff --git a/keystoneclient/tests/v2_0/utils.py b/keystoneclient/tests/v2_0/utils.py index 238543f95..c5e0ee55b 100644 --- a/keystoneclient/tests/v2_0/utils.py +++ b/keystoneclient/tests/v2_0/utils.py @@ -17,6 +17,7 @@ import httpretty from keystoneclient.tests import utils from keystoneclient.v2_0 import client + TestResponse = utils.TestResponse diff --git a/keystoneclient/tests/v3/test_access.py b/keystoneclient/tests/v3/test_access.py index 1ade338ac..bc7ada938 100644 --- a/keystoneclient/tests/v3/test_access.py +++ b/keystoneclient/tests/v3/test_access.py @@ -19,6 +19,7 @@ from keystoneclient.openstack.common import timeutils from keystoneclient.tests.v3 import client_fixtures from keystoneclient.tests.v3 import utils + TOKEN_RESPONSE = utils.TestResponse({ "headers": client_fixtures.AUTH_RESPONSE_HEADERS }) diff --git a/keystoneclient/tests/v3/utils.py b/keystoneclient/tests/v3/utils.py index 1935691ab..620c0f54d 100644 --- a/keystoneclient/tests/v3/utils.py +++ b/keystoneclient/tests/v3/utils.py @@ -21,6 +21,7 @@ from keystoneclient.openstack.common import jsonutils from keystoneclient.tests import utils from keystoneclient.v3 import client + TestResponse = utils.TestResponse diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py index 78d282413..ae6437461 100644 --- a/keystoneclient/v2_0/client.py +++ b/keystoneclient/v2_0/client.py @@ -12,6 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + import logging from keystoneclient import exceptions diff --git a/keystoneclient/v3/client.py b/keystoneclient/v3/client.py index 8204e8811..7f8cf90d0 100644 --- a/keystoneclient/v3/client.py +++ b/keystoneclient/v3/client.py @@ -12,6 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + import logging from keystoneclient import exceptions