From b47f226647243464b1af4a182390f1301d7e804a Mon Sep 17 00:00:00 2001 From: Tatiana Ovchinnikova Date: Thu, 25 Sep 2014 16:13:02 +0400 Subject: [PATCH] Remove #noqa from django.conf.urls.include We have one more import with #noqa: django.conf.urls.include that is also commonly used in urls.py module and could be included to the list of import exceptions. This change has also revealed one unused import. Change-Id: I47cc582340625aac87ab0242b147e11ef1d9b38e --- HACKING.rst | 27 +++---------------- horizon/base.py | 2 +- horizon/site_urls.py | 2 +- horizon/test/urls.py | 2 +- .../dashboards/admin/hypervisors/urls.py | 2 +- .../dashboards/admin/networks/urls.py | 2 +- .../dashboards/admin/volumes/urls.py | 2 +- .../admin/volumes/volume_types/urls.py | 2 +- .../dashboards/admin/volumes/volumes/urls.py | 1 - .../project/access_and_security/urls.py | 2 +- .../dashboards/project/images/urls.py | 2 +- .../dashboards/project/networks/urls.py | 2 +- .../dashboards/project/volumes/urls.py | 2 +- openstack_dashboard/urls.py | 2 +- tox.ini | 1 + 15 files changed, 16 insertions(+), 37 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 96dbc31fc1..7ac9b75bfa 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -3,30 +3,9 @@ Horizon Style Commandments - Step 1: Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ -- Step 2: The following names can be imported directly, without triggering the - "H302: import only modules" flake8 warning:: - - collections.defaultdict, - django.conf.settings, - django.conf.urls.patterns, - django.conf.urls.url, - django.core.urlresolvers.reverse, - django.core.urlresolvers.reverse_lazy, - django.template.loader.render_to_string, - django.test.utils.override_settings, - django.utils.datastructures.SortedDict, - django.utils.encoding.force_text, - django.utils.html.conditional_escape, - django.utils.html.escape, - django.utils.http.urlencode, - django.utils.safestring.mark_safe, - django.utils.translation.npgettext_lazy, - django.utils.translation.pgettext_lazy, - django.utils.translation.ugettext_lazy, - django.utils.translation.ungettext_lazy, - operator.attrgetter, - StringIO.StringIO - +- Step 2: Read [hacking] section in tox.ini to find the list of names which + can be imported directly without triggering the "H302: import only modules" + flake8 warning - Step 3: Read on Horizon Specific Commandments diff --git a/horizon/base.py b/horizon/base.py index 1734a6fe7e..267791227b 100644 --- a/horizon/base.py +++ b/horizon/base.py @@ -27,7 +27,7 @@ import logging import os from django.conf import settings -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured # noqa diff --git a/horizon/site_urls.py b/horizon/site_urls.py index 4321bb4bc1..efa2a10d31 100644 --- a/horizon/site_urls.py +++ b/horizon/site_urls.py @@ -17,7 +17,7 @@ # under the License. from django.conf import settings -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url from django.views.generic import TemplateView # noqa diff --git a/horizon/test/urls.py b/horizon/test/urls.py index ccf5c1c150..7926dcb44d 100644 --- a/horizon/test/urls.py +++ b/horizon/test/urls.py @@ -20,7 +20,7 @@ URL patterns for testing Horizon views. """ -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url from django.contrib.staticfiles.urls import staticfiles_urlpatterns # noqa diff --git a/openstack_dashboard/dashboards/admin/hypervisors/urls.py b/openstack_dashboard/dashboards/admin/hypervisors/urls.py index 62c798db1f..7db7b73692 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/urls.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/urls.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/admin/networks/urls.py b/openstack_dashboard/dashboards/admin/networks/urls.py index 09318cc4b7..46f1c108bd 100644 --- a/openstack_dashboard/dashboards/admin/networks/urls.py +++ b/openstack_dashboard/dashboards/admin/networks/urls.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/admin/volumes/urls.py b/openstack_dashboard/dashboards/admin/volumes/urls.py index afebebba3c..a8464d5043 100644 --- a/openstack_dashboard/dashboards/admin/volumes/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/urls.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py index 6afcf5e458..686fe1340b 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py b/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py index c85cf51292..00f053f920 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/project/access_and_security/urls.py b/openstack_dashboard/dashboards/project/access_and_security/urls.py index f82fef4ab2..5de1a90f5d 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/urls.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/project/images/urls.py b/openstack_dashboard/dashboards/project/images/urls.py index 6b722860b0..a9298f77ef 100644 --- a/openstack_dashboard/dashboards/project/images/urls.py +++ b/openstack_dashboard/dashboards/project/images/urls.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/project/networks/urls.py b/openstack_dashboard/dashboards/project/networks/urls.py index 28f9111ea6..3ba628a6e2 100644 --- a/openstack_dashboard/dashboards/project/networks/urls.py +++ b/openstack_dashboard/dashboards/project/networks/urls.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/dashboards/project/volumes/urls.py b/openstack_dashboard/dashboards/project/volumes/urls.py index b6de5522f1..9a6b830e59 100644 --- a/openstack_dashboard/dashboards/project/volumes/urls.py +++ b/openstack_dashboard/dashboards/project/volumes/urls.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls import url diff --git a/openstack_dashboard/urls.py b/openstack_dashboard/urls.py index 0343b9a420..5b2df03604 100644 --- a/openstack_dashboard/urls.py +++ b/openstack_dashboard/urls.py @@ -21,7 +21,7 @@ URL patterns for the OpenStack Dashboard. """ from django.conf import settings -from django.conf.urls import include # noqa +from django.conf.urls import include from django.conf.urls import patterns from django.conf.urls.static import static # noqa from django.conf.urls import url diff --git a/tox.ini b/tox.ini index a482c1f123..693b62de22 100644 --- a/tox.ini +++ b/tox.ini @@ -71,6 +71,7 @@ ignore = E127,E128,H307,H405,H803,H904 [hacking] import_exceptions = collections.defaultdict, django.conf.settings, + django.conf.urls.include, django.conf.urls.patterns, django.conf.urls.url, django.core.urlresolvers.reverse,