diff --git a/HACKING.rst b/HACKING.rst index fdebbd93f2..c959a2f8cf 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -8,6 +8,8 @@ Horizon Style Commandments 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, diff --git a/doc/source/topics/tutorial.rst b/doc/source/topics/tutorial.rst index 8de6d30415..b9340373c3 100644 --- a/doc/source/topics/tutorial.rst +++ b/doc/source/topics/tutorial.rst @@ -396,8 +396,8 @@ URLs ---- The auto-generated ``urls.py`` file is like:: - from django.conf.urls import patterns # noqa - from django.conf.urls import url # noqa + from django.conf.urls import patterns + from django.conf.urls import url from .views import IndexView @@ -428,8 +428,8 @@ Notice that ``mypanel_tabs`` is the ``slug`` attribute defined in the The completed ``urls.py`` file should look like the following:: - from django.conf.urls import patterns # noqa - from django.conf.urls import url # noqa + from django.conf.urls import patterns + from django.conf.urls import url from openstack_dashboard.dashboards.mydashboard.mypanel import views diff --git a/horizon/base.py b/horizon/base.py index 80a59e324c..1734a6fe7e 100644 --- a/horizon/base.py +++ b/horizon/base.py @@ -28,8 +28,8 @@ import os from django.conf import settings from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured # noqa from django.core.urlresolvers import reverse from django.utils.datastructures import SortedDict diff --git a/horizon/conf/panel_template/urls.py b/horizon/conf/panel_template/urls.py index bdc88da891..c723f4e70d 100644 --- a/horizon/conf/panel_template/urls.py +++ b/horizon/conf/panel_template/urls.py @@ -1,5 +1,5 @@ -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from .views import IndexView diff --git a/horizon/site_urls.py b/horizon/site_urls.py index a2f4ed6402..4321bb4bc1 100644 --- a/horizon/site_urls.py +++ b/horizon/site_urls.py @@ -18,8 +18,8 @@ from django.conf import settings from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from django.views.generic import TemplateView # noqa from horizon.test.jasmine import jasmine diff --git a/horizon/test/test_dashboards/cats/kittens/urls.py b/horizon/test/test_dashboards/cats/kittens/urls.py index c9dced36f6..212d9ce956 100644 --- a/horizon/test/test_dashboards/cats/kittens/urls.py +++ b/horizon/test/test_dashboards/cats/kittens/urls.py @@ -1,5 +1,5 @@ -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from horizon.test.test_dashboards.cats.kittens.views import IndexView # noqa diff --git a/horizon/test/test_dashboards/cats/tigers/urls.py b/horizon/test/test_dashboards/cats/tigers/urls.py index 5c41af375d..8f339b0a68 100644 --- a/horizon/test/test_dashboards/cats/tigers/urls.py +++ b/horizon/test/test_dashboards/cats/tigers/urls.py @@ -1,5 +1,5 @@ -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from horizon.test.test_dashboards.cats.tigers.views import IndexView # noqa diff --git a/horizon/test/test_dashboards/dogs/puppies/urls.py b/horizon/test/test_dashboards/dogs/puppies/urls.py index 05a7e3466d..a15bfc55c5 100644 --- a/horizon/test/test_dashboards/dogs/puppies/urls.py +++ b/horizon/test/test_dashboards/dogs/puppies/urls.py @@ -1,5 +1,5 @@ -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from horizon.test.test_dashboards.dogs.puppies.views import IndexView # noqa from horizon.test.test_dashboards.dogs.puppies.views import TwoTabsView # noqa diff --git a/horizon/test/urls.py b/horizon/test/urls.py index 268caa5325..ccf5c1c150 100644 --- a/horizon/test/urls.py +++ b/horizon/test/urls.py @@ -21,8 +21,8 @@ URL patterns for testing Horizon views. """ from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from django.contrib.staticfiles.urls import staticfiles_urlpatterns # noqa from django.views.generic import TemplateView # noqa diff --git a/openstack_dashboard/dashboards/admin/aggregates/urls.py b/openstack_dashboard/dashboards/admin/aggregates/urls.py index 520d5b9147..f06758cd0f 100644 --- a/openstack_dashboard/dashboards/admin/aggregates/urls.py +++ b/openstack_dashboard/dashboards/admin/aggregates/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.aggregates \ import views diff --git a/openstack_dashboard/dashboards/admin/flavors/urls.py b/openstack_dashboard/dashboards/admin/flavors/urls.py index e64a757d6c..c96c82cc90 100644 --- a/openstack_dashboard/dashboards/admin/flavors/urls.py +++ b/openstack_dashboard/dashboards/admin/flavors/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.flavors import views diff --git a/openstack_dashboard/dashboards/admin/hypervisors/compute/urls.py b/openstack_dashboard/dashboards/admin/hypervisors/compute/urls.py index 1717593bfd..67475dad19 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/compute/urls.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/compute/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.hypervisors.compute import views diff --git a/openstack_dashboard/dashboards/admin/hypervisors/urls.py b/openstack_dashboard/dashboards/admin/hypervisors/urls.py index 30a6c62581..62c798db1f 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/urls.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/urls.py @@ -13,8 +13,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.hypervisors.compute \ import urls as compute_urls diff --git a/openstack_dashboard/dashboards/admin/images/urls.py b/openstack_dashboard/dashboards/admin/images/urls.py index b586c4552d..a28ec48616 100644 --- a/openstack_dashboard/dashboards/admin/images/urls.py +++ b/openstack_dashboard/dashboards/admin/images/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.images import views diff --git a/openstack_dashboard/dashboards/admin/info/urls.py b/openstack_dashboard/dashboards/admin/info/urls.py index af0fc8154b..552f23aeae 100644 --- a/openstack_dashboard/dashboards/admin/info/urls.py +++ b/openstack_dashboard/dashboards/admin/info/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.info import views diff --git a/openstack_dashboard/dashboards/admin/instances/urls.py b/openstack_dashboard/dashboards/admin/instances/urls.py index 30a7e905f7..6330a10fd4 100644 --- a/openstack_dashboard/dashboards/admin/instances/urls.py +++ b/openstack_dashboard/dashboards/admin/instances/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.instances import views diff --git a/openstack_dashboard/dashboards/admin/metering/urls.py b/openstack_dashboard/dashboards/admin/metering/urls.py index 9dbf0a110c..f06bbf3d23 100644 --- a/openstack_dashboard/dashboards/admin/metering/urls.py +++ b/openstack_dashboard/dashboards/admin/metering/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.metering import views diff --git a/openstack_dashboard/dashboards/admin/networks/ports/urls.py b/openstack_dashboard/dashboards/admin/networks/ports/urls.py index 6ddba576c4..dadc736135 100644 --- a/openstack_dashboard/dashboards/admin/networks/ports/urls.py +++ b/openstack_dashboard/dashboards/admin/networks/ports/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.networks.ports import views diff --git a/openstack_dashboard/dashboards/admin/networks/subnets/urls.py b/openstack_dashboard/dashboards/admin/networks/subnets/urls.py index b192ba0c4e..8485ed619a 100644 --- a/openstack_dashboard/dashboards/admin/networks/subnets/urls.py +++ b/openstack_dashboard/dashboards/admin/networks/subnets/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.networks.subnets import views diff --git a/openstack_dashboard/dashboards/admin/networks/urls.py b/openstack_dashboard/dashboards/admin/networks/urls.py index 04afc4299a..09318cc4b7 100644 --- a/openstack_dashboard/dashboards/admin/networks/urls.py +++ b/openstack_dashboard/dashboards/admin/networks/urls.py @@ -13,8 +13,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.networks.agents \ import views as agent_views diff --git a/openstack_dashboard/dashboards/admin/overview/urls.py b/openstack_dashboard/dashboards/admin/overview/urls.py index 1568821b7a..5b9f1ef356 100644 --- a/openstack_dashboard/dashboards/admin/overview/urls.py +++ b/openstack_dashboard/dashboards/admin/overview/urls.py @@ -17,8 +17,8 @@ # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.overview import views diff --git a/openstack_dashboard/dashboards/admin/routers/ports/urls.py b/openstack_dashboard/dashboards/admin/routers/ports/urls.py index 515472415b..9aded53690 100644 --- a/openstack_dashboard/dashboards/admin/routers/ports/urls.py +++ b/openstack_dashboard/dashboards/admin/routers/ports/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.routers.ports import views diff --git a/openstack_dashboard/dashboards/admin/routers/urls.py b/openstack_dashboard/dashboards/admin/routers/urls.py index 15d78222ca..6740e8afee 100644 --- a/openstack_dashboard/dashboards/admin/routers/urls.py +++ b/openstack_dashboard/dashboards/admin/routers/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.routers import views diff --git a/openstack_dashboard/dashboards/admin/volumes/snapshots/urls.py b/openstack_dashboard/dashboards/admin/volumes/snapshots/urls.py index 59d81fc378..f696bfbd35 100644 --- a/openstack_dashboard/dashboards/admin/volumes/snapshots/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/snapshots/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.volumes.snapshots import views diff --git a/openstack_dashboard/dashboards/admin/volumes/urls.py b/openstack_dashboard/dashboards/admin/volumes/urls.py index a17484e993..afebebba3c 100644 --- a/openstack_dashboard/dashboards/admin/volumes/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/urls.py @@ -11,8 +11,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.volumes.snapshots \ import urls as snapshot_urls diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/urls.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/urls.py index df57ae8e49..183e048743 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.volumes.volume_types.extras \ import views diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py index 26ac824969..8b074185f2 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.volumes.volume_types.qos_specs \ import views diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py index 5f63770511..6afcf5e458 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/urls.py @@ -11,8 +11,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.volumes.volume_types.extras \ import urls as extras_urls diff --git a/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py b/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py index 50d8a2face..c85cf51292 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/volumes/urls.py @@ -11,8 +11,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.admin.volumes.volumes \ import views diff --git a/openstack_dashboard/dashboards/identity/domains/urls.py b/openstack_dashboard/dashboards/identity/domains/urls.py index 3877856544..995c7a6bbc 100644 --- a/openstack_dashboard/dashboards/identity/domains/urls.py +++ b/openstack_dashboard/dashboards/identity/domains/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.identity.domains import views diff --git a/openstack_dashboard/dashboards/identity/groups/urls.py b/openstack_dashboard/dashboards/identity/groups/urls.py index e461c28d60..84090064fc 100644 --- a/openstack_dashboard/dashboards/identity/groups/urls.py +++ b/openstack_dashboard/dashboards/identity/groups/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.identity.groups import views diff --git a/openstack_dashboard/dashboards/identity/projects/urls.py b/openstack_dashboard/dashboards/identity/projects/urls.py index 9b58cc0baa..0ac708f8c1 100644 --- a/openstack_dashboard/dashboards/identity/projects/urls.py +++ b/openstack_dashboard/dashboards/identity/projects/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.identity.projects import views diff --git a/openstack_dashboard/dashboards/identity/roles/urls.py b/openstack_dashboard/dashboards/identity/roles/urls.py index 0e5e0b6371..711dd01428 100644 --- a/openstack_dashboard/dashboards/identity/roles/urls.py +++ b/openstack_dashboard/dashboards/identity/roles/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.identity.roles import views diff --git a/openstack_dashboard/dashboards/identity/users/urls.py b/openstack_dashboard/dashboards/identity/users/urls.py index 2143390ad2..acb74bc5d9 100644 --- a/openstack_dashboard/dashboards/identity/users/urls.py +++ b/openstack_dashboard/dashboards/identity/users/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.identity.users import views diff --git a/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py b/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py index bc69e3a51e..9bca6ff219 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.access_and_security.\ api_access import views diff --git a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py index 26db800fa0..7c03acb94e 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.access_and_security.\ floating_ips import views diff --git a/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py b/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py index 0d6d28eff1..d34159d999 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.access_and_security.keypairs \ import views diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py index 8db6464ab3..b57c16f421 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.access_and_security.\ security_groups import views diff --git a/openstack_dashboard/dashboards/project/access_and_security/urls.py b/openstack_dashboard/dashboards/project/access_and_security/urls.py index e9c35f5a77..f82fef4ab2 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/urls.py @@ -17,8 +17,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.access_and_security.\ api_access import urls as api_access_urls diff --git a/openstack_dashboard/dashboards/project/containers/urls.py b/openstack_dashboard/dashboards/project/containers/urls.py index 589d42d455..d91268b140 100644 --- a/openstack_dashboard/dashboards/project/containers/urls.py +++ b/openstack_dashboard/dashboards/project/containers/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.containers import views diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/urls.py b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/urls.py index dd17d92b8e..9783760aa9 100644 --- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/urls.py @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project. \ data_processing.cluster_templates.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/clusters/urls.py b/openstack_dashboard/dashboards/project/data_processing/clusters/urls.py index d252289c46..4ee940d938 100644 --- a/openstack_dashboard/dashboards/project/data_processing/clusters/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/clusters/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project.data_processing. \ clusters.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/urls.py b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/urls.py index f53e91878c..255bb29155 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project. \ data_processing.data_image_registry.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/data_plugins/urls.py b/openstack_dashboard/dashboards/project/data_processing/data_plugins/urls.py index bcb7a69de8..ff1fa6741b 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_plugins/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_plugins/urls.py @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.\ data_processing.data_plugins import views diff --git a/openstack_dashboard/dashboards/project/data_processing/data_sources/urls.py b/openstack_dashboard/dashboards/project/data_processing/data_sources/urls.py index bd16377032..922c221247 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_sources/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_sources/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project.data_processing. \ data_sources.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/job_binaries/urls.py b/openstack_dashboard/dashboards/project/data_processing/job_binaries/urls.py index 0b29ba82b1..595d7ebcea 100644 --- a/openstack_dashboard/dashboards/project/data_processing/job_binaries/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/job_binaries/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project.data_processing. \ job_binaries.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/job_executions/urls.py b/openstack_dashboard/dashboards/project/data_processing/job_executions/urls.py index 50eb5d7fcb..472355ba62 100644 --- a/openstack_dashboard/dashboards/project/data_processing/job_executions/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/job_executions/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project.data_processing. \ job_executions.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/urls.py b/openstack_dashboard/dashboards/project/data_processing/jobs/urls.py index bb0812d497..7529145db7 100644 --- a/openstack_dashboard/dashboards/project/data_processing/jobs/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/jobs/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project.data_processing. \ jobs.views as views diff --git a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/urls.py b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/urls.py index 2bcd21dd32..9082eeda2e 100644 --- a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/urls.py +++ b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/urls.py @@ -12,8 +12,8 @@ # limitations under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url import openstack_dashboard.dashboards.project. \ data_processing.nodegroup_templates.views as views diff --git a/openstack_dashboard/dashboards/project/database_backups/urls.py b/openstack_dashboard/dashboards/project/database_backups/urls.py index d126946a33..869706ec59 100644 --- a/openstack_dashboard/dashboards/project/database_backups/urls.py +++ b/openstack_dashboard/dashboards/project/database_backups/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.database_backups import views diff --git a/openstack_dashboard/dashboards/project/databases/urls.py b/openstack_dashboard/dashboards/project/databases/urls.py index d0cd387f9d..701dbf6e79 100644 --- a/openstack_dashboard/dashboards/project/databases/urls.py +++ b/openstack_dashboard/dashboards/project/databases/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.databases import views diff --git a/openstack_dashboard/dashboards/project/firewalls/urls.py b/openstack_dashboard/dashboards/project/firewalls/urls.py index d522189a8e..8642010942 100644 --- a/openstack_dashboard/dashboards/project/firewalls/urls.py +++ b/openstack_dashboard/dashboards/project/firewalls/urls.py @@ -14,8 +14,8 @@ # # @author: KC Wang, Big Switch Networks -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.firewalls import views diff --git a/openstack_dashboard/dashboards/project/images/images/urls.py b/openstack_dashboard/dashboards/project/images/images/urls.py index 39e93d41a2..10dfd3dc19 100644 --- a/openstack_dashboard/dashboards/project/images/images/urls.py +++ b/openstack_dashboard/dashboards/project/images/images/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.images.images import views diff --git a/openstack_dashboard/dashboards/project/images/snapshots/urls.py b/openstack_dashboard/dashboards/project/images/snapshots/urls.py index 9d83829593..4a37a9b5ae 100644 --- a/openstack_dashboard/dashboards/project/images/snapshots/urls.py +++ b/openstack_dashboard/dashboards/project/images/snapshots/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.images.snapshots import views diff --git a/openstack_dashboard/dashboards/project/images/urls.py b/openstack_dashboard/dashboards/project/images/urls.py index e4786718a4..6b722860b0 100644 --- a/openstack_dashboard/dashboards/project/images/urls.py +++ b/openstack_dashboard/dashboards/project/images/urls.py @@ -17,8 +17,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.images.images \ import urls as image_urls diff --git a/openstack_dashboard/dashboards/project/instances/urls.py b/openstack_dashboard/dashboards/project/instances/urls.py index c056152ab6..68ff4d268a 100644 --- a/openstack_dashboard/dashboards/project/instances/urls.py +++ b/openstack_dashboard/dashboards/project/instances/urls.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.instances import views diff --git a/openstack_dashboard/dashboards/project/loadbalancers/urls.py b/openstack_dashboard/dashboards/project/loadbalancers/urls.py index 98bd7afa06..0356c71cf7 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/urls.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.loadbalancers import views diff --git a/openstack_dashboard/dashboards/project/network_topology/urls.py b/openstack_dashboard/dashboards/project/network_topology/urls.py index a2f26b7c9c..55909a2627 100644 --- a/openstack_dashboard/dashboards/project/network_topology/urls.py +++ b/openstack_dashboard/dashboards/project/network_topology/urls.py @@ -17,8 +17,8 @@ # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.network_topology import views diff --git a/openstack_dashboard/dashboards/project/networks/ports/urls.py b/openstack_dashboard/dashboards/project/networks/ports/urls.py index 4fbcc9d3d6..d54e64d200 100644 --- a/openstack_dashboard/dashboards/project/networks/ports/urls.py +++ b/openstack_dashboard/dashboards/project/networks/ports/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.networks.ports import views diff --git a/openstack_dashboard/dashboards/project/networks/subnets/urls.py b/openstack_dashboard/dashboards/project/networks/subnets/urls.py index 0b25c77efa..09ae455ce7 100644 --- a/openstack_dashboard/dashboards/project/networks/subnets/urls.py +++ b/openstack_dashboard/dashboards/project/networks/subnets/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.networks.subnets import views diff --git a/openstack_dashboard/dashboards/project/networks/urls.py b/openstack_dashboard/dashboards/project/networks/urls.py index 33d75fabef..28f9111ea6 100644 --- a/openstack_dashboard/dashboards/project/networks/urls.py +++ b/openstack_dashboard/dashboards/project/networks/urls.py @@ -13,8 +13,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.networks.ports \ import urls as port_urls diff --git a/openstack_dashboard/dashboards/project/overview/urls.py b/openstack_dashboard/dashboards/project/overview/urls.py index 688af140b5..a4f8b2986c 100644 --- a/openstack_dashboard/dashboards/project/overview/urls.py +++ b/openstack_dashboard/dashboards/project/overview/urls.py @@ -17,8 +17,8 @@ # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.overview import views diff --git a/openstack_dashboard/dashboards/project/routers/ports/urls.py b/openstack_dashboard/dashboards/project/routers/ports/urls.py index 2cad2510c3..edfd1d726a 100644 --- a/openstack_dashboard/dashboards/project/routers/ports/urls.py +++ b/openstack_dashboard/dashboards/project/routers/ports/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.routers.ports import views diff --git a/openstack_dashboard/dashboards/project/routers/urls.py b/openstack_dashboard/dashboards/project/routers/urls.py index ba484c81c7..b6d7e764fd 100644 --- a/openstack_dashboard/dashboards/project/routers/urls.py +++ b/openstack_dashboard/dashboards/project/routers/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.routers.extensions.routerrules\ import views as rr_views diff --git a/openstack_dashboard/dashboards/project/stacks/urls.py b/openstack_dashboard/dashboards/project/stacks/urls.py index a00d8b3732..57d54ab7ee 100644 --- a/openstack_dashboard/dashboards/project/stacks/urls.py +++ b/openstack_dashboard/dashboards/project/stacks/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.stacks import views diff --git a/openstack_dashboard/dashboards/project/volumes/backups/urls.py b/openstack_dashboard/dashboards/project/volumes/backups/urls.py index 9d3d9ab925..efff3903d5 100644 --- a/openstack_dashboard/dashboards/project/volumes/backups/urls.py +++ b/openstack_dashboard/dashboards/project/volumes/backups/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.volumes.backups import views diff --git a/openstack_dashboard/dashboards/project/volumes/snapshots/urls.py b/openstack_dashboard/dashboards/project/volumes/snapshots/urls.py index 0fe5f01b95..12a485bdd5 100644 --- a/openstack_dashboard/dashboards/project/volumes/snapshots/urls.py +++ b/openstack_dashboard/dashboards/project/volumes/snapshots/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.volumes.snapshots import views diff --git a/openstack_dashboard/dashboards/project/volumes/urls.py b/openstack_dashboard/dashboards/project/volumes/urls.py index c6e66a724f..b6de5522f1 100644 --- a/openstack_dashboard/dashboards/project/volumes/urls.py +++ b/openstack_dashboard/dashboards/project/volumes/urls.py @@ -13,8 +13,8 @@ # under the License. from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.volumes.backups \ import urls as backups_urls diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/urls.py b/openstack_dashboard/dashboards/project/volumes/volumes/urls.py index 01c31ae89e..75b9760104 100644 --- a/openstack_dashboard/dashboards/project/volumes/volumes/urls.py +++ b/openstack_dashboard/dashboards/project/volumes/volumes/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.volumes \ .volumes import views diff --git a/openstack_dashboard/dashboards/project/vpn/urls.py b/openstack_dashboard/dashboards/project/vpn/urls.py index 0de3a38360..34e2a8c78e 100644 --- a/openstack_dashboard/dashboards/project/vpn/urls.py +++ b/openstack_dashboard/dashboards/project/vpn/urls.py @@ -14,8 +14,8 @@ # # @author: Tatiana Mazur -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.project.vpn import views diff --git a/openstack_dashboard/dashboards/router/nexus1000v/urls.py b/openstack_dashboard/dashboards/router/nexus1000v/urls.py index 7a370d6a8f..ee5f57cb45 100644 --- a/openstack_dashboard/dashboards/router/nexus1000v/urls.py +++ b/openstack_dashboard/dashboards/router/nexus1000v/urls.py @@ -13,8 +13,8 @@ # @author: Abishek Subramanian, Cisco Systems, Inc. # @author: Sergey Sudakovich, Cisco Systems, Inc. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.router.nexus1000v import views diff --git a/openstack_dashboard/dashboards/settings/password/urls.py b/openstack_dashboard/dashboards/settings/password/urls.py index 9abdb7029a..f5b75a9748 100644 --- a/openstack_dashboard/dashboards/settings/password/urls.py +++ b/openstack_dashboard/dashboards/settings/password/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.settings.password import views diff --git a/openstack_dashboard/dashboards/settings/user/urls.py b/openstack_dashboard/dashboards/settings/user/urls.py index b74f328a5b..b0c51c2f98 100644 --- a/openstack_dashboard/dashboards/settings/user/urls.py +++ b/openstack_dashboard/dashboards/settings/user/urls.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.dashboards.settings.user import views diff --git a/openstack_dashboard/test/error_pages_urls.py b/openstack_dashboard/test/error_pages_urls.py index 963cab3f4d..0ee1182bbd 100644 --- a/openstack_dashboard/test/error_pages_urls.py +++ b/openstack_dashboard/test/error_pages_urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns # noqa +from django.conf.urls import patterns from openstack_dashboard.urls import urlpatterns # noqa diff --git a/openstack_dashboard/test/test_panels/plugin_panel/urls.py b/openstack_dashboard/test/test_panels/plugin_panel/urls.py index 5faa645ee6..4886314a04 100644 --- a/openstack_dashboard/test/test_panels/plugin_panel/urls.py +++ b/openstack_dashboard/test/test_panels/plugin_panel/urls.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa -from django.conf.urls import url # noqa +from django.conf.urls import patterns +from django.conf.urls import url from openstack_dashboard.test.test_panels.plugin_panel import views diff --git a/openstack_dashboard/urls.py b/openstack_dashboard/urls.py index a1a344256b..0343b9a420 100644 --- a/openstack_dashboard/urls.py +++ b/openstack_dashboard/urls.py @@ -22,9 +22,9 @@ URL patterns for the OpenStack Dashboard. from django.conf import settings from django.conf.urls import include # noqa -from django.conf.urls import patterns # noqa +from django.conf.urls import patterns from django.conf.urls.static import static # noqa -from django.conf.urls import url # noqa +from django.conf.urls import url from django.contrib.staticfiles.urls import staticfiles_urlpatterns # noqa import horizon diff --git a/tox.ini b/tox.ini index 8d8e4a5f81..a482c1f123 100644 --- a/tox.ini +++ b/tox.ini @@ -71,6 +71,8 @@ ignore = E127,E128,H307,H405,H803,H904 [hacking] import_exceptions = 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,