From 640d6f4ff4d38704ea5f43f3196910ffff4e6c51 Mon Sep 17 00:00:00 2001
From: Lianhao Lu <lianhao.lu@intel.com>
Date: Fri, 22 Nov 2013 10:57:11 +0800
Subject: [PATCH] Enable pep8 E711/E712/E721/H302 checking

Change-Id: I229f1c15b46284fae94d4c786765baa18da0055f
---
 ceilometerclient/common/http.py          | 7 +++----
 ceilometerclient/tests/v2/test_alarms.py | 3 ++-
 tox.ini                                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ceilometerclient/common/http.py b/ceilometerclient/common/http.py
index 1a4b58c7..1c6f29b6 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 a4fadc5a..3f8a2760 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'],
diff --git a/tox.ini b/tox.ini
index 1da2a5a4..fc1a86ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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