Merge "Adjust import items according to hacking import rule"

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__),
                 '..', '..')))
 

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
 

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__)
 
 

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__)
 
 

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
 

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:

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

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__)

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

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

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'

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"}'
 
 

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"}',

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

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
 

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
 
 

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
 })

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
 
 

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

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