Merge "Remove #noqa from two common imports and add them to import_exceptions"

Author: Jenkins

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,

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
 

horizon/base.py

@@ -28,8 +28,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.core.exceptions import ImproperlyConfigured  # noqa
 from django.core.urlresolvers import reverse
 from django.utils.datastructures import SortedDict

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
 

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

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
 

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
 

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

horizon/test/urls.py

@@ -21,8 +21,8 @@
 """
 
 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
 

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

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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

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

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

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

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

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
 

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
 

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
 

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
 

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
 

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

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