Fix PEP H301 (one import per line)

Change-Id: I7b0c991c869c903e60123ad5bdf876b06d83e3e9

diff --git a/heat/common/client.py b/heat/common/client.py
index 702b61316719123991c67e24befa24e8ad117341..8b8cb9d0906c8c3e6c64b6af29a8fcad1f440fe0 100644 (file)
--- a/heat/common/client.py
+++ b/heat/common/client.py
@@ -32,7 +32,8 @@ except ImportError:
     import ssl
 
 from heat.common import auth
-from heat.common import exception, utils
+from heat.common import exception
+from heat.common import utils
 
 
 # common chunk size for get and put

diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 75c79039e61f50f6308c991167f224a786ce7f68..b5788df25ea58fca1cb724ab5d4a2a663bb6286b 100644 (file)
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -31,7 +31,8 @@ import time
 
 import eventlet
 import eventlet.greenio
-from eventlet.green import socket, ssl
+from eventlet.green import socket
+from eventlet.green import ssl
 import eventlet.wsgi
 from lxml import etree
 from oslo.config import cfg

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 2e359d80bbb7b46e82b21ebe60fd2ea91169ced9..79ca9c759db3a39e5ec77635a6c5eee82dd01b15 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -20,7 +20,8 @@ from sqlalchemy.orm import relationship, backref, object_mapper
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import types as types
-from json import dumps, loads
+from json import dumps
+from json import loads
 from heat.openstack.common import uuidutils
 from heat.openstack.common import timeutils
 from heat.db.sqlalchemy.session import get_session

diff --git a/tox.ini b/tox.ini
index e70c03eba30ea54474dd1e44ef91c45b11cb81ef..1859a2bf44b50de8bea44582e6e8d43c1bbfb84a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ commands =
   python setup.py testr --coverage
 
 [flake8]
-ignore = H302,H303,H304,H403,H404,F403,F841,H306,H902,H201,H101,H703,H301,H702
+ignore = H302,H303,H304,H403,H404,F403,F841,H306,H902,H201,H101,H703,H702
 show-source = true
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,build