diff options
| -rw-r--r-- | ceilometerclient/common/http.py | 7 | ||||
| -rw-r--r-- | ceilometerclient/tests/v2/test_alarms.py | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ceilometerclient/common/http.py b/ceilometerclient/common/http.py index 1a4b58c..1c6f29b 100644 --- a/ceilometerclient/common/http.py +++ b/ceilometerclient/common/http.py @@ -16,12 +16,8 @@ import copy import logging import os -import six import socket -from ceilometerclient.openstack.common.py3kcompat import urlutils -from six.moves import http_client as httplib - try: import ssl except ImportError: @@ -33,8 +29,11 @@ try: except ImportError: import simplejson as json +import six +from six.moves import http_client as httplib # noqa from ceilometerclient import exc +from ceilometerclient.openstack.common.py3kcompat import urlutils LOG = logging.getLogger(__name__) diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/v2/test_alarms.py index a4fadc5..3f8a276 100644 --- a/ceilometerclient/tests/v2/test_alarms.py +++ b/ceilometerclient/tests/v2/test_alarms.py @@ -17,12 +17,13 @@ # under the License. import copy + import six +from six.moves import xrange # noqa import testtools from ceilometerclient.tests import utils from ceilometerclient.v2 import alarms -from six.moves import xrange AN_ALARM = {u'alarm_actions': [u'http://site:8000/alarm'], u'ok_actions': [u'http://site:8000/ok'], @@ -24,6 +24,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' commands = {posargs} [flake8] -ignore = E711,E721,E712,H233,H302 +ignore = H233 show-source = True exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools |