From 50295fb39e44374944efca8dfcc1d6d321915f3d Mon Sep 17 00:00:00 2001
From: Jordan Cazamias <jordan.cazamias@rackspace.com>
Date: Wed, 18 Jun 2014 13:19:26 -0500
Subject: [PATCH] Fix style errors H305 and H307

H305: Imports not grouped correctly
H307: Like imports should be grouped together

Change-Id: Ic63d253e015298c7b952121a4b3634d2b1bdaf92
Implements: blueprint new-hacking-style-rules
---
 .../notification_handler/sample.py                       | 2 ++
 contrib/dns_dump_dnspy.py                                | 4 +++-
 contrib/ipaextractor.py                                  | 5 ++++-
 contrib/zoneextractor.py                                 | 4 +++-
 designate/__init__.py                                    | 1 +
 designate/agent/service.py                               | 2 ++
 designate/api/__init__.py                                | 2 ++
 designate/api/middleware.py                              | 2 +-
 designate/api/service.py                                 | 3 ++-
 designate/api/v1/__init__.py                             | 2 ++
 designate/api/v1/domains.py                              | 2 ++
 designate/api/v1/extensions/diagnostics.py               | 1 +
 designate/api/v1/extensions/quotas.py                    | 2 ++
 designate/api/v1/extensions/reports.py                   | 2 ++
 designate/api/v1/extensions/sync.py                      | 2 ++
 designate/api/v1/extensions/touch.py                     | 2 ++
 designate/api/v1/limits.py                               | 2 ++
 designate/api/v1/records.py                              | 2 ++
 designate/api/v1/servers.py                              | 2 ++
 designate/api/v1/tsigkeys.py                             | 2 ++
 designate/api/v2/__init__.py                             | 4 +++-
 designate/api/v2/app.py                                  | 2 ++
 designate/api/v2/controllers/blacklists.py               | 2 ++
 designate/api/v2/controllers/floatingips.py              | 4 +++-
 designate/api/v2/controllers/limits.py                   | 2 ++
 designate/api/v2/controllers/nameservers.py              | 2 ++
 designate/api/v2/controllers/records.py                  | 2 ++
 designate/api/v2/controllers/recordsets.py               | 2 ++
 designate/api/v2/controllers/rest.py                     | 5 ++++-
 designate/api/v2/controllers/schemas.py                  | 2 ++
 designate/api/v2/controllers/tlds.py                     | 2 ++
 designate/api/v2/controllers/zones.py                    | 2 ++
 designate/api/v2/patches.py                              | 2 ++
 designate/api/v2/views/base.py                           | 2 ++
 designate/backend/base.py                                | 1 +
 designate/backend/impl_bind9.py                          | 7 +++++--
 designate/backend/impl_dynect.py                         | 1 +
 designate/backend/impl_ipa/__init__.py                   | 7 +++++--
 designate/backend/impl_ipa/auth.py                       | 3 +++
 designate/backend/impl_multi.py                          | 7 +++++--
 designate/backend/impl_nsd4slave.py                      | 7 +++++--
 designate/backend/impl_powerdns/__init__.py              | 3 +++
 .../migrate_repo/versions/002_add_moniker_id_cols.py     | 2 ++
 .../migrate_repo/versions/006_add_inherit_ttl_col.py     | 2 ++
 .../migrate_repo/versions/007_add_recordset_id_col.py    | 2 ++
 designate/backend/impl_powerdns/models.py                | 1 +
 designate/central/service.py                             | 1 +
 designate/cmd/agent.py                                   | 3 +++
 designate/cmd/api.py                                     | 3 +++
 designate/cmd/central.py                                 | 3 +++
 designate/cmd/manage.py                                  | 4 +---
 designate/cmd/mdns.py                                    | 3 +++
 designate/cmd/sink.py                                    | 3 +++
 designate/context.py                                     | 2 ++
 designate/manage/database.py                             | 3 ++-
 designate/manage/powerdns.py                             | 4 +++-
 designate/manage/tlds.py                                 | 1 +
 designate/mdns/handler.py                                | 1 +
 designate/mdns/service.py                                | 2 ++
 designate/network_api/__init__.py                        | 3 +++
 designate/network_api/fake.py                            | 1 +
 designate/network_api/neutron.py                         | 1 -
 designate/notification_handler/__init__.py               | 2 ++
 designate/notification_handler/base.py                   | 2 ++
 designate/notification_handler/neutron.py                | 2 ++
 designate/notification_handler/nova.py                   | 2 ++
 designate/plugin.py                                      | 1 +
 designate/policy.py                                      | 2 ++
 designate/quota/__init__.py                              | 2 ++
 designate/quota/base.py                                  | 2 +-
 designate/quota/impl_storage.py                          | 2 ++
 designate/rpc.py                                         | 1 +
 designate/schema/_validators.py                          | 1 +
 designate/schema/format.py                               | 3 +++
 designate/schema/resolvers.py                            | 1 +
 designate/schema/validators.py                           | 2 ++
 designate/service.py                                     | 1 +
 designate/sink/service.py                                | 1 +
 designate/sqlalchemy/models.py                           | 1 +
 designate/sqlalchemy/session.py                          | 6 ++++--
 designate/sqlalchemy/types.py                            | 3 ++-
 designate/storage/api.py                                 | 1 +
 designate/storage/base.py                                | 2 ++
 designate/storage/impl_sqlalchemy/__init__.py            | 2 ++
 designate/storage/impl_sqlalchemy/migrate_repo/utils.py  | 2 ++
 .../migrate_repo/versions/001_add_moniker_schema.py      | 2 ++
 .../versions/002_add_managed_col_for_records.py          | 2 ++
 .../versions/007_add_parent_domain_id_col.py             | 2 ++
 .../migrate_repo/versions/009_add_tsigkeys_table.py      | 1 +
 .../migrate_repo/versions/010_drop_server_ip_cols.py     | 2 ++
 .../migrate_repo/versions/012_add_serial_col.py          | 4 +++-
 .../migrate_repo/versions/014_add_quotas_table.py        | 1 +
 .../versions/015_add_unique_record_constraint.py         | 3 +++
 .../versions/017_drop_unique_domain_name_index.py        | 2 ++
 .../versions/018_add_back_unique_name_deleted_sqlite.py  | 2 ++
 .../versions/020_add_description_domains_records.py      | 4 +++-
 .../migrate_repo/versions/022_add_domain_status.py       | 4 +++-
 .../migrate_repo/versions/033_add_record_tenant_id.py    | 4 +++-
 .../migrate_repo/versions/034_add_recordsets_table.py    | 2 ++
 .../versions/035_add_unique_record_sqlite.py             | 2 ++
 .../036_add_managed_tenant_and_region_and_extra.py       | 3 ++-
 .../migrate_repo/versions/037_add_tlds_table.py          | 2 ++
 .../migrate_repo/versions/038_add_blacklists_table.py    | 2 ++
 designate/storage/impl_sqlalchemy/models.py              | 5 ++++-
 designate/tests/__init__.py                              | 9 +++++----
 designate/tests/test_api/test_middleware.py              | 1 +
 designate/tests/test_api/test_v1/test_domains.py         | 1 +
 designate/tests/test_api/test_v1/test_records.py         | 1 +
 designate/tests/test_api/test_v1/test_servers.py         | 1 +
 designate/tests/test_api/test_v2/__init__.py             | 2 ++
 designate/tests/test_api/test_v2/test_limits.py          | 1 +
 designate/tests/test_api/test_v2/test_nameservers.py     | 1 +
 designate/tests/test_api/test_v2/test_records.py         | 1 +
 designate/tests/test_api/test_v2/test_recordsets.py      | 1 +
 designate/tests/test_api/test_v2/test_zones.py           | 1 +
 designate/tests/test_backend/__init__.py                 | 1 +
 designate/tests/test_backend/test_backends.py            | 1 +
 designate/tests/test_backend/test_ipa.py                 | 2 ++
 designate/tests/test_backend/test_multi.py               | 1 +
 designate/tests/test_backend/test_nsd4slave.py           | 7 ++++---
 designate/tests/test_backend/test_powerdns.py            | 2 ++
 designate/tests/test_central/_test_service_ipa.py        | 3 ++-
 designate/tests/test_central/test_service.py             | 3 +++
 designate/tests/test_mdns/test_handler.py                | 2 ++
 designate/tests/test_network_api/test_neutron.py         | 9 ++++-----
 designate/tests/test_notification_handler/__init__.py    | 3 +++
 designate/tests/test_quota/test_quota.py                 | 1 +
 designate/tests/test_storage/__init__.py                 | 5 ++++-
 designate/tests/test_storage/test_api.py                 | 2 ++
 designate/tests/test_utils.py                            | 2 ++
 designate/utils.py                                       | 3 ++-
 tox.ini                                                  | 4 +---
 132 files changed, 276 insertions(+), 50 deletions(-)

diff --git a/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py b/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py
index 26606f00..a326e048 100644
--- a/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py
+++ b/contrib/designate-ext-samplehandler/designate_ext_samplehandler/notification_handler/sample.py
@@ -14,10 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.objects import Record
 from designate.notification_handler.base import NotificationHandler
 
+
 LOG = logging.getLogger(__name__)
 
 # Setup a config group
diff --git a/contrib/dns_dump_dnspy.py b/contrib/dns_dump_dnspy.py
index 49e32880..ae16fc9b 100755
--- a/contrib/dns_dump_dnspy.py
+++ b/contrib/dns_dump_dnspy.py
@@ -14,10 +14,12 @@
 # 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 binascii
+
 import dns
 import dns.message
 import dns.rdatatype
-import binascii
+
 
 # Prepare a Packet
 request = dns.message.make_query(
diff --git a/contrib/ipaextractor.py b/contrib/ipaextractor.py
index 70a788a1..4446ae7a 100644
--- a/contrib/ipaextractor.py
+++ b/contrib/ipaextractor.py
@@ -16,18 +16,21 @@
 
 import sys
 import logging
-import requests
 import uuid
 import pprint
 import json
 import copy
+
+import requests
 from oslo.config import cfg
+
 from designate.backend import impl_ipa
 from designate.openstack.common.gettextutils import _LI
 from designate.openstack.common.gettextutils import _LW
 from designate.openstack.common.gettextutils import _LE
 from designate import utils
 
+
 logging.basicConfig()
 LOG = logging.getLogger(__name__)
 
diff --git a/contrib/zoneextractor.py b/contrib/zoneextractor.py
index 3a192592..a550ffb3 100644
--- a/contrib/zoneextractor.py
+++ b/contrib/zoneextractor.py
@@ -17,9 +17,11 @@
 import sys
 import re
 import os
-import dns.zone
 import argparse
 import logging
+
+import dns.zone
+
 from designate.openstack.common.gettextutils import _LI
 from designate.openstack.common.gettextutils import _LE
 
diff --git a/designate/__init__.py b/designate/__init__.py
index 62e11bca..0c40c116 100644
--- a/designate/__init__.py
+++ b/designate/__init__.py
@@ -15,6 +15,7 @@
 # under the License.
 import os
 import socket
+
 from oslo.config import cfg
 from oslo import messaging
 
diff --git a/designate/agent/service.py b/designate/agent/service.py
index 816c96da..f1d2b4f9 100644
--- a/designate/agent/service.py
+++ b/designate/agent/service.py
@@ -14,12 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import backend
 from designate import rpc
 from designate import service
 from designate.central import rpcapi as central_rpcapi
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/__init__.py b/designate/api/__init__.py
index 77c61c36..42ba933f 100644
--- a/designate/api/__init__.py
+++ b/designate/api/__init__.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.central import rpcapi
 
+
 cfg.CONF.register_group(cfg.OptGroup(
     name='service:api', title="Configuration for API Service"
 ))
diff --git a/designate/api/middleware.py b/designate/api/middleware.py
index 8162d06a..4d82b1bf 100644
--- a/designate/api/middleware.py
+++ b/designate/api/middleware.py
@@ -15,7 +15,6 @@
 # under the License.
 import flask
 import webob.dec
-
 from oslo.config import cfg
 from oslo import messaging
 
@@ -32,6 +31,7 @@ from designate.openstack.common.gettextutils import _LI
 from designate.openstack.common.gettextutils import _LE
 from designate.openstack.common.gettextutils import _LC
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_opts([
diff --git a/designate/api/service.py b/designate/api/service.py
index 9252cd47..3c098da0 100644
--- a/designate/api/service.py
+++ b/designate/api/service.py
@@ -14,10 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from paste import deploy
+from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LI
 from designate.openstack.deprecated import wsgi
-from oslo.config import cfg
 from designate import exceptions
 from designate import utils
 from designate import policy
diff --git a/designate/api/v1/__init__.py b/designate/api/v1/__init__.py
index 815c2c41..24199b29 100644
--- a/designate/api/v1/__init__.py
+++ b/designate/api/v1/__init__.py
@@ -21,11 +21,13 @@ from werkzeug import wrappers
 from werkzeug.routing import BaseConverter
 from werkzeug.routing import ValidationError
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common import jsonutils
 from designate import exceptions
 from designate import utils
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_opts([
diff --git a/designate/api/v1/domains.py b/designate/api/v1/domains.py
index 7100f5b5..3bb987a1 100644
--- a/designate/api/v1/domains.py
+++ b/designate/api/v1/domains.py
@@ -14,11 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate.api import get_central_api
 from designate.objects import Domain
 
+
 LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('domains', __name__)
 domain_schema = schema.Schema('v1', 'domain')
diff --git a/designate/api/v1/extensions/diagnostics.py b/designate/api/v1/extensions/diagnostics.py
index daff4abd..00243952 100644
--- a/designate/api/v1/extensions/diagnostics.py
+++ b/designate/api/v1/extensions/diagnostics.py
@@ -19,6 +19,7 @@ from oslo import messaging
 from designate.openstack.common import log as logging
 from designate import rpc
 
+
 LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('diagnostics', __name__)
 
diff --git a/designate/api/v1/extensions/quotas.py b/designate/api/v1/extensions/quotas.py
index 4860a4ca..d6dee8b1 100644
--- a/designate/api/v1/extensions/quotas.py
+++ b/designate/api/v1/extensions/quotas.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate.central import rpcapi as central_rpcapi
 
+
 LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('quotas', __name__)
diff --git a/designate/api/v1/extensions/reports.py b/designate/api/v1/extensions/reports.py
index afd4e554..72dfeae0 100644
--- a/designate/api/v1/extensions/reports.py
+++ b/designate/api/v1/extensions/reports.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate.central import rpcapi as central_rpcapi
 
+
 LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('reports', __name__)
diff --git a/designate/api/v1/extensions/sync.py b/designate/api/v1/extensions/sync.py
index 8c880356..5d1dd4d4 100644
--- a/designate/api/v1/extensions/sync.py
+++ b/designate/api/v1/extensions/sync.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate.central import rpcapi as central_rpcapi
 
+
 LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('sync', __name__)
diff --git a/designate/api/v1/extensions/touch.py b/designate/api/v1/extensions/touch.py
index d5475e21..46f1aa9e 100644
--- a/designate/api/v1/extensions/touch.py
+++ b/designate/api/v1/extensions/touch.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.central import rpcapi as central_rpcapi
 
+
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('touch', __name__)
 
diff --git a/designate/api/v1/limits.py b/designate/api/v1/limits.py
index bab59ffd..1ea51a50 100644
--- a/designate/api/v1/limits.py
+++ b/designate/api/v1/limits.py
@@ -14,10 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate.api import get_central_api
 
+
 LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('limits', __name__)
 limits_schema = schema.Schema('v1', 'limits')
diff --git a/designate/api/v1/records.py b/designate/api/v1/records.py
index 68d436f2..f465182d 100644
--- a/designate/api/v1/records.py
+++ b/designate/api/v1/records.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate import exceptions
 from designate import schema
@@ -21,6 +22,7 @@ from designate.api import get_central_api
 from designate.objects import Record
 from designate.objects import RecordSet
 
+
 LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('records', __name__)
 record_schema = schema.Schema('v1', 'record')
diff --git a/designate/api/v1/servers.py b/designate/api/v1/servers.py
index 0c798375..19b05328 100644
--- a/designate/api/v1/servers.py
+++ b/designate/api/v1/servers.py
@@ -14,11 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate.api import get_central_api
 from designate.objects import Server
 
+
 LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('servers', __name__)
 server_schema = schema.Schema('v1', 'server')
diff --git a/designate/api/v1/tsigkeys.py b/designate/api/v1/tsigkeys.py
index 598dacdf..42900c90 100644
--- a/designate/api/v1/tsigkeys.py
+++ b/designate/api/v1/tsigkeys.py
@@ -14,11 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate.api import get_central_api
 from designate.objects import TsigKey
 
+
 LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('tsigkeys', __name__)
 tsigkey_schema = schema.Schema('v1', 'tsigkey')
diff --git a/designate/api/v2/__init__.py b/designate/api/v2/__init__.py
index 8f3c0622..f0979fe2 100644
--- a/designate/api/v2/__init__.py
+++ b/designate/api/v2/__init__.py
@@ -13,11 +13,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designate.api.v2 import patches  # flake8: noqa
 import pecan.deploy
 from oslo.config import cfg
+
+from designate.api.v2 import patches  # flake8: noqa
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/app.py b/designate/api/v2/app.py
index 3aba20c2..ab7c6602 100644
--- a/designate/api/v2/app.py
+++ b/designate/api/v2/app.py
@@ -16,8 +16,10 @@
 import pecan
 import pecan.deploy
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_opts([
diff --git a/designate/api/v2/controllers/blacklists.py b/designate/api/v2/controllers/blacklists.py
index 1d94f7a6..37ede72f 100644
--- a/designate/api/v2/controllers/blacklists.py
+++ b/designate/api/v2/controllers/blacklists.py
@@ -15,6 +15,7 @@
 # under the License.
 
 import pecan
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate import utils
@@ -22,6 +23,7 @@ from designate.api.v2.controllers import rest
 from designate.api.v2.views import blacklists as blacklists_view
 from designate.objects import Blacklist
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/floatingips.py b/designate/api/v2/controllers/floatingips.py
index 484de654..e4589490 100644
--- a/designate/api/v2/controllers/floatingips.py
+++ b/designate/api/v2/controllers/floatingips.py
@@ -13,8 +13,10 @@
 # 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 pecan
 import re
+
+import pecan
+
 from designate import exceptions
 from designate import schema
 from designate.api.v2.controllers import rest
diff --git a/designate/api/v2/controllers/limits.py b/designate/api/v2/controllers/limits.py
index 92610b2b..480f889d 100644
--- a/designate/api/v2/controllers/limits.py
+++ b/designate/api/v2/controllers/limits.py
@@ -15,10 +15,12 @@
 # under the License.
 
 import pecan
+
 from designate.openstack.common import log as logging
 from designate.api.v2.controllers import rest
 from designate.api.v2.views import limits as limits_view
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/nameservers.py b/designate/api/v2/controllers/nameservers.py
index 66c251aa..5b147dfa 100644
--- a/designate/api/v2/controllers/nameservers.py
+++ b/designate/api/v2/controllers/nameservers.py
@@ -15,11 +15,13 @@
 # under the License.
 
 import pecan
+
 from designate import utils
 from designate.openstack.common import log as logging
 from designate.api.v2.controllers import rest
 from designate.api.v2.views import nameservers as nameservers_view
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/records.py b/designate/api/v2/controllers/records.py
index 4b59c16b..4ad030d7 100644
--- a/designate/api/v2/controllers/records.py
+++ b/designate/api/v2/controllers/records.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import pecan
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate import utils
@@ -21,6 +22,7 @@ from designate.api.v2.controllers import rest
 from designate.api.v2.views import records as records_view
 from designate.objects import Record
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/recordsets.py b/designate/api/v2/controllers/recordsets.py
index 14c0b39b..8608a19a 100644
--- a/designate/api/v2/controllers/recordsets.py
+++ b/designate/api/v2/controllers/recordsets.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import pecan
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate import utils
@@ -22,6 +23,7 @@ from designate.api.v2.views import recordsets as recordsets_view
 from designate.api.v2.controllers import records
 from designate.objects import RecordSet
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/rest.py b/designate/api/v2/controllers/rest.py
index db3184f7..88d2d388 100644
--- a/designate/api/v2/controllers/rest.py
+++ b/designate/api/v2/controllers/rest.py
@@ -24,16 +24,19 @@
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import six
 import inspect
+
+import six
 import pecan
 import pecan.rest
 import pecan.routing
+
 from designate import exceptions
 from designate import api
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/schemas.py b/designate/api/v2/controllers/schemas.py
index c2103ab3..6c730737 100644
--- a/designate/api/v2/controllers/schemas.py
+++ b/designate/api/v2/controllers/schemas.py
@@ -14,7 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import os
+
 import pecan
+
 from designate import exceptions
 from designate import utils
 from designate.openstack.common import log as logging
diff --git a/designate/api/v2/controllers/tlds.py b/designate/api/v2/controllers/tlds.py
index 54a522d2..2167b11e 100644
--- a/designate/api/v2/controllers/tlds.py
+++ b/designate/api/v2/controllers/tlds.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import pecan
+
 from designate.openstack.common import log as logging
 from designate import schema
 from designate import utils
@@ -20,6 +21,7 @@ from designate.api.v2.controllers import rest
 from designate.api.v2.views import tlds as tlds_view
 from designate.objects import Tld
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/controllers/zones.py b/designate/api/v2/controllers/zones.py
index 8005e8d6..38308f54 100644
--- a/designate/api/v2/controllers/zones.py
+++ b/designate/api/v2/controllers/zones.py
@@ -17,6 +17,7 @@ import pecan
 from dns import zone as dnszone
 from dns import rdatatype
 from dns import exception as dnsexception
+
 from designate import exceptions
 from designate import utils
 from designate import schema
@@ -29,6 +30,7 @@ from designate.objects import Record
 from designate.objects import RecordSet
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/api/v2/patches.py b/designate/api/v2/patches.py
index 563401f1..6d7a6770 100644
--- a/designate/api/v2/patches.py
+++ b/designate/api/v2/patches.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import pecan.core
+
 from designate import exceptions
 from designate.openstack.common import jsonutils
 
+
 JSON_TYPES = ('application/json', 'application/json-patch+json')
 
 
diff --git a/designate/api/v2/views/base.py b/designate/api/v2/views/base.py
index be120fd7..f51ee3cc 100644
--- a/designate/api/v2/views/base.py
+++ b/designate/api/v2/views/base.py
@@ -14,7 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import urllib
+
 from oslo.config import cfg
+
 from designate import exceptions
 from designate.openstack.common import log as logging
 
diff --git a/designate/backend/base.py b/designate/backend/base.py
index 8a363e6b..48b28351 100644
--- a/designate/backend/base.py
+++ b/designate/backend/base.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LW
 from designate import exceptions
diff --git a/designate/backend/impl_bind9.py b/designate/backend/impl_bind9.py
index 5b2f1a83..4b287a80 100644
--- a/designate/backend/impl_bind9.py
+++ b/designate/backend/impl_bind9.py
@@ -14,13 +14,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import os
+import glob
+import shutil
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LW
 from designate import utils
 from designate.backend import base
-import glob
-import shutil
+
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/backend/impl_dynect.py b/designate/backend/impl_dynect.py
index 5d27d49f..e6969233 100644
--- a/designate/backend/impl_dynect.py
+++ b/designate/backend/impl_dynect.py
@@ -27,6 +27,7 @@ from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LI
 from designate.openstack.common.gettextutils import _LW
 
+
 LOG = logging.getLogger(__name__)
 
 GROUP = 'backend:dynect'
diff --git a/designate/backend/impl_ipa/__init__.py b/designate/backend/impl_ipa/__init__.py
index d0caa561..d8f557cd 100644
--- a/designate/backend/impl_ipa/__init__.py
+++ b/designate/backend/impl_ipa/__init__.py
@@ -13,16 +13,19 @@
 # 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 pprint
+import time
+
 import requests
 from oslo.config import cfg
+
 from designate import exceptions
 from designate.openstack.common import log as logging
 from designate.openstack.common import importutils
 from designate.backend import base
 from designate.openstack.common import jsonutils as json
 from designate.openstack.common.gettextutils import _LE
-import pprint
-import time
+
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/backend/impl_ipa/auth.py b/designate/backend/impl_ipa/auth.py
index 4f8442b9..e067517f 100644
--- a/designate/backend/impl_ipa/auth.py
+++ b/designate/backend/impl_ipa/auth.py
@@ -16,12 +16,15 @@
 import os
 import logging
 import uuid
+
 from requests import auth
 import kerberos
+
 from designate.backend.impl_ipa import IPAAuthError
 from designate.openstack.common.gettextutils import _LW
 from designate.openstack.common.gettextutils import _LE
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/backend/impl_multi.py b/designate/backend/impl_multi.py
index b3376505..50a9651f 100644
--- a/designate/backend/impl_multi.py
+++ b/designate/backend/impl_multi.py
@@ -14,12 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import logging
+
+from oslo.config import cfg
+
 from designate import backend
 from designate import exceptions
 from designate.backend import base
 from designate.openstack.common import excutils
-from oslo.config import cfg
-import logging
+
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/backend/impl_nsd4slave.py b/designate/backend/impl_nsd4slave.py
index 00d39404..ee853944 100644
--- a/designate/backend/impl_nsd4slave.py
+++ b/designate/backend/impl_nsd4slave.py
@@ -14,14 +14,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import eventlet
 import os
 import socket
 import ssl
+
+import eventlet
+from oslo.config import cfg
+
 from designate import exceptions
 from designate.backend import base
 from designate.openstack.common import log as logging
-from oslo.config import cfg
+
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/backend/impl_powerdns/__init__.py b/designate/backend/impl_powerdns/__init__.py
index eb68dd05..3e7e9de9 100644
--- a/designate/backend/impl_powerdns/__init__.py
+++ b/designate/backend/impl_powerdns/__init__.py
@@ -16,11 +16,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import base64
+
 from sqlalchemy import func
 from sqlalchemy.sql import select
 from sqlalchemy.sql.expression import and_
 from sqlalchemy.orm import exc as sqlalchemy_exceptions
 from oslo.config import cfg
+
 from designate.openstack.common import excutils
 from designate.openstack.common import log as logging
 from designate import exceptions
@@ -30,6 +32,7 @@ from designate.sqlalchemy.session import get_session
 from designate.sqlalchemy.session import SQLOPTS
 from designate.sqlalchemy.expressions import InsertFromSelect
 
+
 LOG = logging.getLogger(__name__)
 TSIG_SUPPORTED_ALGORITHMS = ['hmac-md5']
 
diff --git a/designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py b/designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py
index 91f96c4a..97f0c3d1 100644
--- a/designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py
+++ b/designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from sqlalchemy import MetaData, Table, Column
+
 from designate.sqlalchemy.types import UUID
 
+
 meta = MetaData()
 
 
diff --git a/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py b/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py
index 280de0e1..f74054c2 100644
--- a/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py
+++ b/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py
@@ -15,8 +15,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from sqlalchemy import MetaData, Table, Column, Boolean
+
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/backend/impl_powerdns/migrate_repo/versions/007_add_recordset_id_col.py b/designate/backend/impl_powerdns/migrate_repo/versions/007_add_recordset_id_col.py
index 65c3eea4..657fc33c 100644
--- a/designate/backend/impl_powerdns/migrate_repo/versions/007_add_recordset_id_col.py
+++ b/designate/backend/impl_powerdns/migrate_repo/versions/007_add_recordset_id_col.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from sqlalchemy import MetaData, Table, Column
+
 from designate.sqlalchemy.types import UUID
 
+
 meta = MetaData()
 
 
diff --git a/designate/backend/impl_powerdns/models.py b/designate/backend/impl_powerdns/models.py
index e59368c9..d581abfc 100644
--- a/designate/backend/impl_powerdns/models.py
+++ b/designate/backend/impl_powerdns/models.py
@@ -17,6 +17,7 @@
 # under the License.
 from sqlalchemy import Column, String, Text, Integer, Boolean
 from sqlalchemy.ext.declarative import declarative_base
+
 from designate.sqlalchemy.models import Base as CommonBase
 from designate.sqlalchemy.types import UUID
 
diff --git a/designate/central/service.py b/designate/central/service.py
index 2e1b0122..7fa90895 100644
--- a/designate/central/service.py
+++ b/designate/central/service.py
@@ -32,6 +32,7 @@ from designate import service
 from designate import utils
 from designate.storage import api as storage_api
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/cmd/agent.py b/designate/cmd/agent.py
index 18d3b69f..330a9e89 100644
--- a/designate/cmd/agent.py
+++ b/designate/cmd/agent.py
@@ -14,12 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import service
 from designate import utils
 from designate.agent import service as agent_service
 
+
 CONF = cfg.CONF
 CONF.import_opt('workers', 'designate.agent', group='service:agent')
 
diff --git a/designate/cmd/api.py b/designate/cmd/api.py
index c7a73cb4..b07af638 100644
--- a/designate/cmd/api.py
+++ b/designate/cmd/api.py
@@ -14,13 +14,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common import service
 from designate import rpc
 from designate import utils
 from designate.api import service as api_service
 
+
 CONF = cfg.CONF
 CONF.import_opt('workers', 'designate.api', group='service:api')
 
diff --git a/designate/cmd/central.py b/designate/cmd/central.py
index e9003016..e129dabf 100644
--- a/designate/cmd/central.py
+++ b/designate/cmd/central.py
@@ -14,12 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import service
 from designate import utils
 from designate.central import service as central
 
+
 CONF = cfg.CONF
 CONF.import_opt('workers', 'designate.central', group='service:central')
 
diff --git a/designate/cmd/manage.py b/designate/cmd/manage.py
index 350bd863..153d682c 100644
--- a/designate/cmd/manage.py
+++ b/designate/cmd/manage.py
@@ -16,14 +16,12 @@
 import sys
 
 from oslo.config import cfg
-
+from stevedore.extension import ExtensionManager
 
 from designate.openstack.common import log as logging
 from designate.openstack.common import strutils
 from designate import utils
 
-from stevedore.extension import ExtensionManager
-
 
 def methods_of(obj):
     """Get all callable methods of an object that don't start with underscore
diff --git a/designate/cmd/mdns.py b/designate/cmd/mdns.py
index 7e2e0427..bc2827a0 100644
--- a/designate/cmd/mdns.py
+++ b/designate/cmd/mdns.py
@@ -14,12 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import service
 from designate import utils
 from designate.mdns import service as mdns_service
 
+
 CONF = cfg.CONF
 CONF.import_opt('workers', 'designate.mdns', group='service:mdns')
 
diff --git a/designate/cmd/sink.py b/designate/cmd/sink.py
index 9fb5710e..f43c31aa 100644
--- a/designate/cmd/sink.py
+++ b/designate/cmd/sink.py
@@ -14,12 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import service
 from designate import utils
 from designate.sink import service as sink_service
 
+
 CONF = cfg.CONF
 CONF.import_opt('workers', 'designate.sink', group='service:sink')
 
diff --git a/designate/context.py b/designate/context.py
index 3ec3ea41..fd262f5e 100644
--- a/designate/context.py
+++ b/designate/context.py
@@ -14,10 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import itertools
+
 from designate.openstack.common import context
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LW
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/manage/database.py b/designate/manage/database.py
index 7306267f..edbfc4db 100644
--- a/designate/manage/database.py
+++ b/designate/manage/database.py
@@ -18,9 +18,10 @@ import os
 from migrate.exceptions import (DatabaseAlreadyControlledError,
                                 DatabaseNotControlledError)
 from migrate.versioning import api as versioning_api
+from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LI
-from oslo.config import cfg
 from designate.manage import base
 
 
diff --git a/designate/manage/powerdns.py b/designate/manage/powerdns.py
index 435cb90e..6d87acc2 100644
--- a/designate/manage/powerdns.py
+++ b/designate/manage/powerdns.py
@@ -14,12 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import os
+
 from migrate.exceptions import (DatabaseAlreadyControlledError,
                                 DatabaseNotControlledError)
 from migrate.versioning import api as versioning_api
+from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LI
-from oslo.config import cfg
 from designate.manage import base
 
 
diff --git a/designate/manage/tlds.py b/designate/manage/tlds.py
index 24d4bc03..7d7d9228 100644
--- a/designate/manage/tlds.py
+++ b/designate/manage/tlds.py
@@ -26,6 +26,7 @@ from designate.openstack.common.gettextutils import _LE
 from designate.manage import base
 from designate.schema import format
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/mdns/handler.py b/designate/mdns/handler.py
index dd4584a2..88bea079 100644
--- a/designate/mdns/handler.py
+++ b/designate/mdns/handler.py
@@ -15,6 +15,7 @@
 # under the License.
 import dns
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.storage import api as storage_api
 
diff --git a/designate/mdns/service.py b/designate/mdns/service.py
index 0abf0b1e..29cfeb49 100644
--- a/designate/mdns/service.py
+++ b/designate/mdns/service.py
@@ -14,7 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import socket
+
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import service
 from designate.mdns import handler
diff --git a/designate/network_api/__init__.py b/designate/network_api/__init__.py
index 9cebb94f..bac81cee 100644
--- a/designate/network_api/__init__.py
+++ b/designate/network_api/__init__.py
@@ -14,9 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import logging
+
 from oslo.config import cfg
+
 from designate.network_api.base import NetworkAPI
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_opts([
diff --git a/designate/network_api/fake.py b/designate/network_api/fake.py
index 37c266a8..e7112d0c 100644
--- a/designate/network_api/fake.py
+++ b/designate/network_api/fake.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import uuid
+
 from designate.openstack.common import log
 from designate.network_api.base import NetworkAPI
 
diff --git a/designate/network_api/neutron.py b/designate/network_api/neutron.py
index b27e9633..707fd8a8 100644
--- a/designate/network_api/neutron.py
+++ b/designate/network_api/neutron.py
@@ -22,7 +22,6 @@ from neutronclient.common import exceptions as neutron_exceptions
 from oslo.config import cfg
 
 from designate import exceptions
-
 from designate.openstack.common import log as logging
 from designate.openstack.common import threadgroup
 from designate.openstack.common.gettextutils import _LW
diff --git a/designate/notification_handler/__init__.py b/designate/notification_handler/__init__.py
index 5a3203ed..27ae4839 100644
--- a/designate/notification_handler/__init__.py
+++ b/designate/notification_handler/__init__.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import logging
+
 from designate.notification_handler.base import NotificationHandler
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/notification_handler/base.py b/designate/notification_handler/base.py
index e2d1d8a3..50df3c9f 100644
--- a/designate/notification_handler/base.py
+++ b/designate/notification_handler/base.py
@@ -15,7 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+
 from oslo.config import cfg
+
 from designate import exceptions
 from designate.openstack.common import log as logging
 from designate.central import rpcapi as central_rpcapi
diff --git a/designate/notification_handler/neutron.py b/designate/notification_handler/neutron.py
index 9a954baf..8507a00a 100644
--- a/designate/notification_handler/neutron.py
+++ b/designate/notification_handler/neutron.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.notification_handler.base import BaseAddressHandler
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_group(cfg.OptGroup(
diff --git a/designate/notification_handler/nova.py b/designate/notification_handler/nova.py
index 82c36d13..8683dbbb 100644
--- a/designate/notification_handler/nova.py
+++ b/designate/notification_handler/nova.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.notification_handler.base import BaseAddressHandler
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_group(cfg.OptGroup(
diff --git a/designate/plugin.py b/designate/plugin.py
index 5ceaf7e1..dee30584 100644
--- a/designate/plugin.py
+++ b/designate/plugin.py
@@ -18,6 +18,7 @@ import abc
 import six
 from stevedore import driver
 from stevedore import enabled
+
 from designate.openstack.common import log as logging
 
 
diff --git a/designate/policy.py b/designate/policy.py
index b9d34c95..1cbce925 100644
--- a/designate/policy.py
+++ b/designate/policy.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common import policy
 from designate.openstack.common.gettextutils import _
@@ -21,6 +22,7 @@ from designate.openstack.common.gettextutils import _LI
 from designate import utils
 from designate import exceptions
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/quota/__init__.py b/designate/quota/__init__.py
index 197b0925..e8a5b651 100644
--- a/designate/quota/__init__.py
+++ b/designate/quota/__init__.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.quota.base import Quota
 
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_opts([
diff --git a/designate/quota/base.py b/designate/quota/base.py
index f9bbb0f7..13459968 100644
--- a/designate/quota/base.py
+++ b/designate/quota/base.py
@@ -16,8 +16,8 @@
 import abc
 
 import six
-
 from oslo.config import cfg
+
 from designate import exceptions
 from designate.plugin import DriverPlugin
 
diff --git a/designate/quota/impl_storage.py b/designate/quota/impl_storage.py
index dc49e4f3..9744b955 100644
--- a/designate/quota/impl_storage.py
+++ b/designate/quota/impl_storage.py
@@ -14,11 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate import exceptions
 from designate.openstack.common import log as logging
 from designate.quota.base import Quota
 from designate.storage import api as sapi
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/rpc.py b/designate/rpc.py
index 9e0e2b91..e5c58ad1 100644
--- a/designate/rpc.py
+++ b/designate/rpc.py
@@ -34,6 +34,7 @@ import designate.exceptions
 from designate.openstack.common import importutils
 from designate.openstack.common import jsonutils
 
+
 CONF = cfg.CONF
 TRANSPORT = None
 NOTIFIER = None
diff --git a/designate/schema/_validators.py b/designate/schema/_validators.py
index c50a7e8f..9a69404f 100644
--- a/designate/schema/_validators.py
+++ b/designate/schema/_validators.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import datetime
+
 import jsonschema
 from jsonschema import _utils
 
diff --git a/designate/schema/format.py b/designate/schema/format.py
index a91990b4..c083ded6 100644
--- a/designate/schema/format.py
+++ b/designate/schema/format.py
@@ -14,11 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import re
+
 import jsonschema
 from jsonschema import compat
 import netaddr
+
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 
 RE_DOMAINNAME = r'^(?!.{255,})(?:(?!\-)[A-Za-z0-9_\-]{1,63}(?<!\-)\.)+$'
diff --git a/designate/schema/resolvers.py b/designate/schema/resolvers.py
index 643a10a5..7feb0e0b 100644
--- a/designate/schema/resolvers.py
+++ b/designate/schema/resolvers.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import jsonschema
+
 from designate.openstack.common import log as logging
 from designate import utils
 
diff --git a/designate/schema/validators.py b/designate/schema/validators.py
index 84976a38..3d04a5c8 100644
--- a/designate/schema/validators.py
+++ b/designate/schema/validators.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from jsonschema import validators
+
 from designate.openstack.common import log as logging
 from designate.schema import _validators
 
+
 LOG = logging.getLogger(__name__)
 
 Draft3Validator = validators.extend(
diff --git a/designate/service.py b/designate/service.py
index f35b9bac..560cdb27 100644
--- a/designate/service.py
+++ b/designate/service.py
@@ -26,6 +26,7 @@ from designate.openstack.common.gettextutils import _
 from designate import rpc
 from designate import version
 
+
 CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
diff --git a/designate/sink/service.py b/designate/sink/service.py
index 20036d0a..0d9c3519 100644
--- a/designate/sink/service.py
+++ b/designate/sink/service.py
@@ -22,6 +22,7 @@ from designate.openstack.common import service
 from designate import notification_handler
 from designate import rpc
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/sqlalchemy/models.py b/designate/sqlalchemy/models.py
index 523bcfc8..55dd3a7c 100644
--- a/designate/sqlalchemy/models.py
+++ b/designate/sqlalchemy/models.py
@@ -17,6 +17,7 @@ from sqlalchemy import Column, DateTime
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.types import CHAR
+
 from designate.openstack.common import timeutils
 from designate import exceptions
 
diff --git a/designate/sqlalchemy/session.py b/designate/sqlalchemy/session.py
index a72a7f64..1b1f39a3 100644
--- a/designate/sqlalchemy/session.py
+++ b/designate/sqlalchemy/session.py
@@ -23,11 +23,12 @@ import sqlalchemy
 from sqlalchemy.exc import DisconnectionError, OperationalError
 import sqlalchemy.orm
 from sqlalchemy.pool import NullPool, StaticPool
-
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LW
 
+
 LOG = logging.getLogger(__name__)
 
 _MAKERS = {}
@@ -203,9 +204,10 @@ def get_maker(engine, autocommit=True, expire_on_commit=False, autoflush=True):
 
 def debug_mysql_do_query():
     """Return a debug version of MySQLdb.cursors._do_query"""
-    import MySQLdb.cursors
     import traceback
 
+    import MySQLdb.cursors
+
     old_mysql_do_query = MySQLdb.cursors.BaseCursor._do_query
 
     def _do_query(self, q):
diff --git a/designate/sqlalchemy/types.py b/designate/sqlalchemy/types.py
index ddc86385..4b5f5602 100644
--- a/designate/sqlalchemy/types.py
+++ b/designate/sqlalchemy/types.py
@@ -13,10 +13,11 @@
 # 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 uuid
+
 from sqlalchemy.types import TypeDecorator, CHAR, VARCHAR
 from sqlalchemy.dialects.postgresql import UUID as pgUUID
 from sqlalchemy.dialects.postgresql import INET as pgINET
-import uuid
 
 
 class UUID(TypeDecorator):
diff --git a/designate/storage/api.py b/designate/storage/api.py
index 3d5beffc..efd33456 100644
--- a/designate/storage/api.py
+++ b/designate/storage/api.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import contextlib
+
 from designate import storage
 from designate.openstack.common import excutils
 
diff --git a/designate/storage/base.py b/designate/storage/base.py
index 280094d1..18d819aa 100644
--- a/designate/storage/base.py
+++ b/designate/storage/base.py
@@ -14,7 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+
 import six
+
 from designate.plugin import DriverPlugin
 
 
diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py
index 09a29556..21199e4c 100644
--- a/designate/storage/impl_sqlalchemy/__init__.py
+++ b/designate/storage/impl_sqlalchemy/__init__.py
@@ -14,10 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import time
+
 from sqlalchemy.orm import exc
 from sqlalchemy import exc as sqlalchemy_exc
 from sqlalchemy import distinct, func
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.db.sqlalchemy.utils import paginate_query
 from designate.openstack.common.db.sqlalchemy.utils import InvalidSortKey
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/utils.py b/designate/storage/impl_sqlalchemy/migrate_repo/utils.py
index dc09dd6a..9d4a6cb1 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/utils.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/utils.py
@@ -21,8 +21,10 @@
 Various conveniences used for migration scripts
 """
 from sqlalchemy.schema import Table as SqlaTable
+
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py
index 01bf1868..f6773932 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py
@@ -18,6 +18,7 @@
 #    under the License.
 from sqlalchemy import ForeignKey, Enum, Integer, String, DateTime, Text
 from sqlalchemy.schema import Column, MetaData
+
 from designate.openstack.common import timeutils
 from designate import utils
 from designate.storage.impl_sqlalchemy.migrate_repo.utils import Table
@@ -26,6 +27,7 @@ from designate.storage.impl_sqlalchemy.migrate_repo.utils import drop_tables
 from designate.sqlalchemy.types import Inet
 from designate.sqlalchemy.types import UUID
 
+
 meta = MetaData()
 
 RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'SRV', 'TXT', 'NS']
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py
index 581dfc87..2b6348bc 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from sqlalchemy import MetaData, Table, Column, Boolean, Unicode
+
 from designate.sqlalchemy.types import UUID
 
+
 meta = MetaData()
 
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py
index 122701b8..51a0d1bc 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from sqlalchemy import MetaData, Table, Column, ForeignKey
+
 from designate.sqlalchemy.types import UUID
 
+
 meta = MetaData()
 
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py
index 85895d17..99a649d7 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py
@@ -15,6 +15,7 @@
 # under the License.
 from sqlalchemy import Enum, Integer, String, DateTime
 from sqlalchemy.schema import Table, Column, MetaData
+
 from designate.openstack.common import timeutils
 from designate import utils
 from designate.sqlalchemy.types import UUID
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py
index 82b40ae1..2f74178d 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py
@@ -14,8 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from sqlalchemy import MetaData, Table, Column
+
 from designate.sqlalchemy.types import Inet
 
+
 meta = MetaData()
 
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py
index be0d7f6c..1820bc65 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py
@@ -13,10 +13,12 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+from sqlalchemy import MetaData, Table, Column, Integer
+
 from designate.openstack.common import timeutils
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LW
-from sqlalchemy import MetaData, Table, Column, Integer
+
 
 LOG = logging.getLogger(__name__)
 meta = MetaData()
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py
index b2125304..4ea3749b 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py
@@ -15,6 +15,7 @@
 # under the License.
 from sqlalchemy import Integer, String, DateTime, UniqueConstraint
 from sqlalchemy.schema import Table, Column, MetaData
+
 from designate.openstack.common import timeutils
 from designate import utils
 from designate.sqlalchemy.types import UUID
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/015_add_unique_record_constraint.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/015_add_unique_record_constraint.py
index b902a9ee..352a6f94 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/015_add_unique_record_constraint.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/015_add_unique_record_constraint.py
@@ -14,12 +14,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import hashlib
+
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.schema import Table, Column, MetaData
 from sqlalchemy.types import String
+
 from designate.openstack.common import log as logging
 from designate.openstack.common.gettextutils import _LW
 
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/017_drop_unique_domain_name_index.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/017_drop_unique_domain_name_index.py
index 9234bbe6..15f992b3 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/017_drop_unique_domain_name_index.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/017_drop_unique_domain_name_index.py
@@ -14,10 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import logging
+
 from sqlalchemy import MetaData, Table, Column, String
 from sqlalchemy.sql import update
 from migrate.changeset.constraint import UniqueConstraint
 
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/018_add_back_unique_name_deleted_sqlite.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/018_add_back_unique_name_deleted_sqlite.py
index fc093607..400c619b 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/018_add_back_unique_name_deleted_sqlite.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/018_add_back_unique_name_deleted_sqlite.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import logging
+
 from sqlalchemy import MetaData, Table
 from migrate.changeset.constraint import UniqueConstraint
 
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/020_add_description_domains_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/020_add_description_domains_records.py
index cc1aba11..28d0ca53 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/020_add_description_domains_records.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/020_add_description_domains_records.py
@@ -13,9 +13,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designate.openstack.common import log as logging
 from sqlalchemy import MetaData, Table, Column, Unicode
 
+from designate.openstack.common import log as logging
+
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/022_add_domain_status.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/022_add_domain_status.py
index 2bca658d..edf98a25 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/022_add_domain_status.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/022_add_domain_status.py
@@ -13,9 +13,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designate.openstack.common import log as logging
 from sqlalchemy import MetaData, Table, Column, Enum
 
+from designate.openstack.common import log as logging
+
+
 LOG = logging.getLogger(__name__)
 RESOURCE_STATUSES = ['ACTIVE', 'PENDING', 'DELETED']
 meta = MetaData()
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/033_add_record_tenant_id.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/033_add_record_tenant_id.py
index d8689758..0dc33769 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/033_add_record_tenant_id.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/033_add_record_tenant_id.py
@@ -13,10 +13,12 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designate.openstack.common import log as logging
 from sqlalchemy import MetaData, Table, Column, String
 from sqlalchemy.sql import select
 
+from designate.openstack.common import log as logging
+
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py
index 240baffe..44657662 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/034_add_recordsets_table.py
@@ -14,12 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import hashlib
+
 from sqlalchemy import ForeignKey, Enum, Integer, String, DateTime, Unicode
 from sqlalchemy import func
 from sqlalchemy.sql import select
 from sqlalchemy.schema import Table, Column, MetaData
 from migrate import ForeignKeyConstraint
 from migrate.changeset.constraint import UniqueConstraint
+
 from designate.openstack.common import timeutils
 from designate import utils
 from designate.sqlalchemy.types import UUID
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/035_add_unique_record_sqlite.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/035_add_unique_record_sqlite.py
index e4e23aa3..9e8b8705 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/035_add_unique_record_sqlite.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/035_add_unique_record_sqlite.py
@@ -14,9 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import logging
+
 from sqlalchemy import MetaData, Table
 from migrate.changeset.constraint import UniqueConstraint
 
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/036_add_managed_tenant_and_region_and_extra.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/036_add_managed_tenant_and_region_and_extra.py
index 9ffa361d..1e07c85b 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/036_add_managed_tenant_and_region_and_extra.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/036_add_managed_tenant_and_region_and_extra.py
@@ -20,9 +20,10 @@
 #
 # See https://blueprints.launchpad.net/nova/+spec/backportable-db-migrations
 # http://lists.openstack.org/pipermail/openstack-dev/2013-March/006827.html
-from designate.openstack.common import log as logging
 from sqlalchemy import MetaData, Table, Column, Unicode
 
+from designate.openstack.common import log as logging
+
 
 LOG = logging.getLogger(__name__)
 meta = MetaData()
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py
index 9a4db2f3..5e32c55b 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/037_add_tlds_table.py
@@ -14,11 +14,13 @@
 #    under the License.
 from sqlalchemy import Integer, String, DateTime, Unicode
 from sqlalchemy.schema import Table, Column, MetaData
+
 from designate.openstack.common import timeutils
 from designate import utils
 from designate.sqlalchemy.types import UUID
 from designate.openstack.common import log as logging
 
+
 LOG = logging.getLogger(__name__)
 meta = MetaData()
 
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py
index cddd7175..b24559f4 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/038_add_blacklists_table.py
@@ -16,10 +16,12 @@
 # under the License.
 from sqlalchemy import Integer, String, DateTime
 from sqlalchemy.schema import Table, Column, MetaData
+
 from designate.openstack.common import timeutils
 from designate import utils
 from designate.sqlalchemy.types import UUID
 
+
 meta = MetaData()
 
 blacklists = Table(
diff --git a/designate/storage/impl_sqlalchemy/models.py b/designate/storage/impl_sqlalchemy/models.py
index ef5c7f58..f347c0dd 100644
--- a/designate/storage/impl_sqlalchemy/models.py
+++ b/designate/storage/impl_sqlalchemy/models.py
@@ -16,17 +16,20 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import hashlib
+
 from oslo.config import cfg
 from sqlalchemy import (Column, DateTime, String, Text, Integer, ForeignKey,
                         Enum, Boolean, Unicode, UniqueConstraint, event)
 from sqlalchemy.orm import relationship, backref
+from sqlalchemy.ext.declarative import declarative_base
+
 from designate.openstack.common import log as logging
 from designate.openstack.common import timeutils
 from designate.sqlalchemy.types import UUID
 from designate.sqlalchemy.models import Base as CommonBase
 from designate.sqlalchemy.models import SoftDeleteMixin
 from designate import utils
-from sqlalchemy.ext.declarative import declarative_base
+
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
diff --git a/designate/tests/__init__.py b/designate/tests/__init__.py
index 7b38ff9f..b51324e0 100644
--- a/designate/tests/__init__.py
+++ b/designate/tests/__init__.py
@@ -14,17 +14,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import copy
-import fixtures
 import functools
 import os
 import inspect
-from migrate.versioning import repository
 import shutil
-import sqlalchemy
 import tempfile
+
+import fixtures
+from migrate.versioning import repository
+import sqlalchemy
 from migrate.versioning import api as versioning_api
 from testtools import testcase
-
 from oslo.config import cfg
 from oslo.messaging import conffixture as messaging_fixture
 from oslo.messaging.notify import _impl_test as test_notifier
@@ -42,6 +42,7 @@ from designate.network_api import fake as fake_network_api
 from designate import network_api
 from designate import objects
 
+
 # NOTE: If eventlet isn't patched and there's a exc tests block
 import eventlet
 eventlet.monkey_patch(os=False)
diff --git a/designate/tests/test_api/test_middleware.py b/designate/tests/test_api/test_middleware.py
index 1bacc12e..eab17a03 100644
--- a/designate/tests/test_api/test_middleware.py
+++ b/designate/tests/test_api/test_middleware.py
@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.tests.test_api import ApiTestCase
 from designate import context
 from designate import exceptions
diff --git a/designate/tests/test_api/test_v1/test_domains.py b/designate/tests/test_api/test_v1/test_domains.py
index 546fa903..bb661c70 100644
--- a/designate/tests/test_api/test_v1/test_domains.py
+++ b/designate/tests/test_api/test_v1/test_domains.py
@@ -16,6 +16,7 @@
 # under the License.
 from mock import patch
 from oslo import messaging
+
 from designate.openstack.common import log as logging
 from designate import exceptions
 from designate.central import service as central_service
diff --git a/designate/tests/test_api/test_v1/test_records.py b/designate/tests/test_api/test_v1/test_records.py
index df8c56c1..a610fb4b 100644
--- a/designate/tests/test_api/test_v1/test_records.py
+++ b/designate/tests/test_api/test_v1/test_records.py
@@ -16,6 +16,7 @@
 # under the License.
 from mock import patch
 from oslo import messaging
+
 from designate.openstack.common import log as logging
 from designate.central import service as central_service
 from designate.tests.test_api.test_v1 import ApiV1Test
diff --git a/designate/tests/test_api/test_v1/test_servers.py b/designate/tests/test_api/test_v1/test_servers.py
index 2b7bc59a..cca41496 100644
--- a/designate/tests/test_api/test_v1/test_servers.py
+++ b/designate/tests/test_api/test_v1/test_servers.py
@@ -15,6 +15,7 @@
 # under the License.
 from mock import patch
 from oslo import messaging
+
 from designate.openstack.common import log as logging
 from designate import exceptions
 from designate.central import service as central_service
diff --git a/designate/tests/test_api/test_v2/__init__.py b/designate/tests/test_api/test_v2/__init__.py
index 4a6c5c0f..5d9c6604 100644
--- a/designate/tests/test_api/test_v2/__init__.py
+++ b/designate/tests/test_api/test_v2/__init__.py
@@ -14,7 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import itertools
+
 from webtest import TestApp
+
 from designate.openstack.common import log as logging
 from designate.api import v2 as api_v2
 from designate.api import middleware
diff --git a/designate/tests/test_api/test_v2/test_limits.py b/designate/tests/test_api/test_v2/test_limits.py
index 69dbd5e8..27d097e4 100644
--- a/designate/tests/test_api/test_v2/test_limits.py
+++ b/designate/tests/test_api/test_v2/test_limits.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate.tests.test_api.test_v2 import ApiV2TestCase
 
 
diff --git a/designate/tests/test_api/test_v2/test_nameservers.py b/designate/tests/test_api/test_v2/test_nameservers.py
index 2e20dced..db755ca8 100644
--- a/designate/tests/test_api/test_v2/test_nameservers.py
+++ b/designate/tests/test_api/test_v2/test_nameservers.py
@@ -15,6 +15,7 @@
 # under the License.
 from mock import patch
 from oslo import messaging
+
 from designate.central import service as central_service
 from designate.tests.test_api.test_v2 import ApiV2TestCase
 
diff --git a/designate/tests/test_api/test_v2/test_records.py b/designate/tests/test_api/test_v2/test_records.py
index 1937f59b..6724e856 100644
--- a/designate/tests/test_api/test_v2/test_records.py
+++ b/designate/tests/test_api/test_v2/test_records.py
@@ -15,6 +15,7 @@
 # under the License.
 from mock import patch
 from oslo import messaging
+
 from designate import exceptions
 from designate.central import service as central_service
 from designate.tests.test_api.test_v2 import ApiV2TestCase
diff --git a/designate/tests/test_api/test_v2/test_recordsets.py b/designate/tests/test_api/test_v2/test_recordsets.py
index 6d8c7eee..201863b4 100644
--- a/designate/tests/test_api/test_v2/test_recordsets.py
+++ b/designate/tests/test_api/test_v2/test_recordsets.py
@@ -15,6 +15,7 @@
 # under the License.
 from mock import patch
 from oslo import messaging
+
 from designate import exceptions
 from designate.central import service as central_service
 from designate.tests.test_api.test_v2 import ApiV2TestCase
diff --git a/designate/tests/test_api/test_v2/test_zones.py b/designate/tests/test_api/test_v2/test_zones.py
index 66a4ee06..1e46fa58 100644
--- a/designate/tests/test_api/test_v2/test_zones.py
+++ b/designate/tests/test_api/test_v2/test_zones.py
@@ -16,6 +16,7 @@
 from dns import zone as dnszone
 from mock import patch
 from oslo import messaging
+
 from designate import exceptions
 from designate.central import service as central_service
 from designate.tests.test_api.test_v2 import ApiV2TestCase
diff --git a/designate/tests/test_backend/__init__.py b/designate/tests/test_backend/__init__.py
index dd19fcbb..2bf2632c 100644
--- a/designate/tests/test_backend/__init__.py
+++ b/designate/tests/test_backend/__init__.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo.config import cfg
+
 from designate import backend
 
 
diff --git a/designate/tests/test_backend/test_backends.py b/designate/tests/test_backend/test_backends.py
index f0d075fe..7324b78b 100644
--- a/designate/tests/test_backend/test_backends.py
+++ b/designate/tests/test_backend/test_backends.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from testscenarios import load_tests_apply_scenarios as load_tests  # noqa
+
 from designate import tests
 from designate.tests.test_backend.test_nsd4slave import NSD4Fixture
 from designate.tests.test_backend import BackendTestMixin
diff --git a/designate/tests/test_backend/test_ipa.py b/designate/tests/test_backend/test_ipa.py
index 81068e76..122b9ea2 100644
--- a/designate/tests/test_backend/test_ipa.py
+++ b/designate/tests/test_backend/test_ipa.py
@@ -15,6 +15,7 @@
 # under the License.
 import fixtures
 from requests.auth import AuthBase
+
 from designate import tests
 from designate import utils
 from designate.tests.test_backend import BackendTestMixin
@@ -22,6 +23,7 @@ from designate.openstack.common import jsonutils as json
 from designate.openstack.common.fixture import mockpatch
 from designate.backend import impl_ipa
 
+
 ipamethods = {"dnszone_add": {}, "dnszone_mod": {},
               "dnszone_del": {}, "dnsrecord_add": {},
               "dnsrecord_mod": {}, "dnsrecord_del": {},
diff --git a/designate/tests/test_backend/test_multi.py b/designate/tests/test_backend/test_multi.py
index ab64e63d..41708257 100644
--- a/designate/tests/test_backend/test_multi.py
+++ b/designate/tests/test_backend/test_multi.py
@@ -16,6 +16,7 @@
 import mock
 from mock import call
 from mock import MagicMock
+
 from designate import exceptions
 from designate import objects
 from designate import tests
diff --git a/designate/tests/test_backend/test_nsd4slave.py b/designate/tests/test_backend/test_nsd4slave.py
index 8e5a6cc9..9c4c5327 100644
--- a/designate/tests/test_backend/test_nsd4slave.py
+++ b/designate/tests/test_backend/test_nsd4slave.py
@@ -14,12 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import eventlet
-import fixtures
-from mock import MagicMock
 import os
 import socket
 import ssl
+
+import eventlet
+import fixtures
+from mock import MagicMock
 from oslo.config import cfg
 
 from designate import exceptions
diff --git a/designate/tests/test_backend/test_powerdns.py b/designate/tests/test_backend/test_powerdns.py
index e82d65e7..0407a76f 100644
--- a/designate/tests/test_backend/test_powerdns.py
+++ b/designate/tests/test_backend/test_powerdns.py
@@ -15,6 +15,7 @@
 # under the License.
 
 import os
+
 from mock import MagicMock
 
 from designate import tests
@@ -22,6 +23,7 @@ from designate.tests import DatabaseFixture
 from designate.tests.test_backend import BackendTestMixin
 from designate import utils
 
+
 # impl_powerdns needs to register its options before being instanciated.
 # Import it and pretend to use it to avoid flake8 unused import errors.
 from designate.backend import impl_powerdns
diff --git a/designate/tests/test_central/_test_service_ipa.py b/designate/tests/test_central/_test_service_ipa.py
index aa60ce62..6b101b45 100644
--- a/designate/tests/test_central/_test_service_ipa.py
+++ b/designate/tests/test_central/_test_service_ipa.py
@@ -16,11 +16,12 @@
 # under the License.
 import unittest
 
+import testtools
+
 from designate.openstack.common import log as logging
 import designate.tests.test_central.test_service
 from designate import utils
 from designate import exceptions
-import testtools
 from designate.backend import impl_ipa
 
 LOG = logging.getLogger(__name__)
diff --git a/designate/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py
index 40a0a885..3fbe17d7 100644
--- a/designate/tests/test_central/test_service.py
+++ b/designate/tests/test_central/test_service.py
@@ -15,12 +15,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import random
+
 import testtools
+
 from designate.openstack.common import log as logging
 from designate import exceptions
 from designate import objects
 from designate.tests.test_central import CentralTestCase
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/tests/test_mdns/test_handler.py b/designate/tests/test_mdns/test_handler.py
index 3ddf74ca..82be6c9f 100644
--- a/designate/tests/test_mdns/test_handler.py
+++ b/designate/tests/test_mdns/test_handler.py
@@ -14,7 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import binascii
+
 from mock import patch
+
 from designate.tests.test_mdns import MdnsTestCase
 from designate.mdns import handler
 
diff --git a/designate/tests/test_network_api/test_neutron.py b/designate/tests/test_network_api/test_neutron.py
index 2a77eaaa..df93a8a0 100644
--- a/designate/tests/test_network_api/test_neutron.py
+++ b/designate/tests/test_network_api/test_neutron.py
@@ -13,17 +13,16 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from designate import exceptions
-from designate.network_api import get_network_api
-from designate.tests import TestCase
-
 from neutronclient.v2_0 import client as clientv20
 from neutronclient.common import exceptions as neutron_exceptions
-
 from oslo.config import cfg
 from mock import patch
 import testtools
 
+from designate import exceptions
+from designate.network_api import get_network_api
+from designate.tests import TestCase
+
 
 cfg.CONF.import_group('network_api:neutron', 'designate.network_api.neutron')
 
diff --git a/designate/tests/test_notification_handler/__init__.py b/designate/tests/test_notification_handler/__init__.py
index 165032e7..66fed90c 100644
--- a/designate/tests/test_notification_handler/__init__.py
+++ b/designate/tests/test_notification_handler/__init__.py
@@ -15,10 +15,13 @@
 # under the License.
 import json
 import os
+
 import testtools
+
 from designate.context import DesignateContext
 from designate.tests import resources
 
+
 FIXTURES_PATH = os.path.join(resources.path, 'sample_notifications')
 
 
diff --git a/designate/tests/test_quota/test_quota.py b/designate/tests/test_quota/test_quota.py
index 9fc23138..af92df6e 100644
--- a/designate/tests/test_quota/test_quota.py
+++ b/designate/tests/test_quota/test_quota.py
@@ -16,6 +16,7 @@
 from testscenarios import load_tests_apply_scenarios as load_tests  # noqa
 import testtools
 from oslo.config import cfg
+
 from designate.openstack.common import log as logging
 from designate import quota
 from designate import tests
diff --git a/designate/tests/test_storage/__init__.py b/designate/tests/test_storage/__init__.py
index d88c490d..2af2a9eb 100644
--- a/designate/tests/test_storage/__init__.py
+++ b/designate/tests/test_storage/__init__.py
@@ -13,13 +13,16 @@
 # 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 testtools
 import uuid
+
+import testtools
+
 from designate.openstack.common import log as logging
 from designate import exceptions
 from designate import objects
 from designate.storage.base import Storage as StorageBase
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/tests/test_storage/test_api.py b/designate/tests/test_storage/test_api.py
index b7e2c628..47f99ba2 100644
--- a/designate/tests/test_storage/test_api.py
+++ b/designate/tests/test_storage/test_api.py
@@ -15,10 +15,12 @@
 # under the License.
 import mock
 import testtools
+
 from designate.openstack.common import log as logging
 from designate.tests import TestCase
 from designate.storage import api as storage_api
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/designate/tests/test_utils.py b/designate/tests/test_utils.py
index d1590a7e..949bff58 100644
--- a/designate/tests/test_utils.py
+++ b/designate/tests/test_utils.py
@@ -15,8 +15,10 @@
 # under the License.
 import os
 import tempfile
+
 import testtools
 from jinja2 import Template
+
 from designate.tests import TestCase
 from designate import exceptions
 from designate import utils
diff --git a/designate/utils.py b/designate/utils.py
index df956443..be29f657 100644
--- a/designate/utils.py
+++ b/designate/utils.py
@@ -18,9 +18,9 @@ import json
 import functools
 import inspect
 import os
-import pkg_resources
 import uuid
 
+import pkg_resources
 from jinja2 import Template
 from oslo.config import cfg
 
@@ -29,6 +29,7 @@ from designate.openstack.common import log as logging
 from designate.openstack.common import processutils
 from designate.openstack.common import timeutils
 
+
 LOG = logging.getLogger(__name__)
 
 
diff --git a/tox.ini b/tox.ini
index d52efaa9..efa81ca4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,13 +38,11 @@ commands = {posargs}
 
 # TODO: The following ignored codes need review
 # H104 file contains nothing more than comments
-# H305 imports not grouped correctly
-# H307 like imports should be grouped together
 # H405 multi line docstring summary not separated with an empty line
 # H904 Wrap long lines in parentheses instead of a backslash
 # E126 continuation line over-indented for hanging indent
 # E128 continuation line under-indented for visual indent
-ignore = H104,H302,H305,H306,H307,H401,H402,H404,H405,H904,E126,E128
+ignore = H104,H302,H306,H401,H402,H404,H405,H904,E126,E128
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*openstack/deprecated*,*lib/python*,*egg,build,tools