diff --git a/designatedashboard/api/designate.py b/designatedashboard/api/designate.py index 3fd432a..becc2e2 100644 --- a/designatedashboard/api/designate.py +++ b/designatedashboard/api/designate.py @@ -14,13 +14,13 @@ from __future__ import absolute_import -from horizon import exceptions -from django.conf import settings -import logging - from designateclient.v1 import Client # noqa from designateclient.v1.domains import Domain # noqa from designateclient.v1.records import Record # noqa +from django.conf import settings # noqa + +from horizon import exceptions +import logging from openstack_dashboard.api.base import url_for # noqa diff --git a/designatedashboard/dashboards/project/dns_domains/forms.py b/designatedashboard/dashboards/project/dns_domains/forms.py index dcdfe0b..d61ffd4 100644 --- a/designatedashboard/dashboards/project/dns_domains/forms.py +++ b/designatedashboard/dashboards/project/dns_domains/forms.py @@ -15,13 +15,15 @@ import functools import logging import re +from designateclient import exceptions as designate_exceptions from django.core.exceptions import ValidationError # noqa from django.core import validators -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ # noqa + from horizon import forms from horizon import messages + from designatedashboard import api -from designateclient import exceptions as designate_exceptions LOG = logging.getLogger(__name__) @@ -56,7 +58,7 @@ def handle_exc(func): msg += " (Request ID: %(request_id)s" data["request_id"] = ex.request_id - form.api_error(_(msg) % data) + form.api_error(_(msg) % data) # noqa return False except Exception: diff --git a/designatedashboard/dashboards/project/dns_domains/tables.py b/designatedashboard/dashboards/project/dns_domains/tables.py index d2d334f..5c87ba3 100644 --- a/designatedashboard/dashboards/project/dns_domains/tables.py +++ b/designatedashboard/dashboards/project/dns_domains/tables.py @@ -16,7 +16,6 @@ import logging from django.core import urlresolvers from django.utils.translation import ugettext_lazy as _ # noqa -from horizon import exceptions from horizon import tables from designatedashboard import api diff --git a/designatedashboard/dashboards/project/dns_domains/urls.py b/designatedashboard/dashboards/project/dns_domains/urls.py index 6c3c854..ac7d005 100644 --- a/designatedashboard/dashboards/project/dns_domains/urls.py +++ b/designatedashboard/dashboards/project/dns_domains/urls.py @@ -15,10 +15,10 @@ from django.conf.urls import url, patterns # noqa from .views import CreateDomainView # noqa from .views import CreateRecordView # noqa +from .views import DomainDetailView # noqa from .views import IndexView # noqa from .views import RecordsView # noqa from .views import UpdateDomainView # noqa -from .views import DomainDetailView # noqa from .views import UpdateRecordView # noqa diff --git a/designatedashboard/dashboards/project/dns_domains/views.py b/designatedashboard/dashboards/project/dns_domains/views.py index e47b9bb..0eb9ea9 100644 --- a/designatedashboard/dashboards/project/dns_domains/views.py +++ b/designatedashboard/dashboards/project/dns_domains/views.py @@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _ # noqa from horizon import exceptions from horizon import forms from horizon import tables -from horizon.views import HorizonTemplateView +from horizon.views import HorizonTemplateView # noqa from designatedashboard import api diff --git a/designatedashboard/exceptions.py b/designatedashboard/exceptions.py index 7df03c9..677fba6 100644 --- a/designatedashboard/exceptions.py +++ b/designatedashboard/exceptions.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. from designateclient import exceptions as designateclient + from openstack_dashboard import exceptions NOT_FOUND = exceptions.NOT_FOUND + ( diff --git a/designatedashboard/tests/settings.py b/designatedashboard/tests/settings.py index 57f8d13..9716133 100644 --- a/designatedashboard/tests/settings.py +++ b/designatedashboard/tests/settings.py @@ -15,7 +15,7 @@ import os -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext as _ # noqa from horizon.test.settings import * # noqa from horizon.utils import secret_key as secret_key_utils