Fix django.conf.urls.defaults imports

These imports aren't available in Django 1.6. We need to use
django.conf.urls instead.

Partially-implements blueprint django-1point6

Change-Id: I692439a76de4fe5abff9ab9395bad5c10f1cdbba
This commit is contained in:
Kieran Spear 2013-11-04 16:46:44 +11:00
parent ae6abf7157
commit 311b6299c5
54 changed files with 117 additions and 117 deletions

View File

@ -29,9 +29,9 @@ import logging
import os
from django.conf import settings # noqa
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from django.core.exceptions import ImproperlyConfigured # noqa
from django.core.urlresolvers import reverse # noqa
from django.utils.datastructures import SortedDict # noqa

View File

@ -1,5 +1,5 @@
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from .views import IndexView

View File

@ -19,9 +19,9 @@
# under the License.
from django.conf import settings # noqa
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from django.views.generic import TemplateView # noqa

View File

@ -1,5 +1,5 @@
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from horizon.test.test_dashboards.cats.kittens.views import IndexView # noqa

View File

@ -1,5 +1,5 @@
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from horizon.test.test_dashboards.cats.tigers.views import IndexView # noqa

View File

@ -1,5 +1,5 @@
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from horizon.test.test_dashboards.dogs.puppies.views import IndexView # noqa

View File

@ -22,9 +22,9 @@
URL patterns for testing Horizon views.
"""
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from django.contrib.staticfiles.urls import staticfiles_urlpatterns # noqa
from django.views.generic import TemplateView # noqa

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.defaults import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.domains import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.flavors.extras import views

View File

@ -18,9 +18,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.flavors.extras \
import urls as extras_urls

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.groups import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.hypervisors import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.images import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.info import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.instances import views
from openstack_dashboard.dashboards.project.instances \

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.networks.ports import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.networks.subnets import views

View File

@ -14,9 +14,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.networks import views

View File

@ -19,8 +19,8 @@
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.overview import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.projects import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.roles import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.routers.ports import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.routers import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.users import views

View File

@ -1,5 +1,5 @@
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.admin.volumes import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.access_and_security.\
api_access import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.access_and_security.\
floating_ips import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.access_and_security.keypairs \
import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.access_and_security.\
security_groups import views

View File

@ -18,9 +18,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.access_and_security.\
api_access import urls as api_access_urls

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.containers import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.database_backups import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.databases import views

View File

@ -15,8 +15,8 @@
#
# @author: KC Wang, Big Switch Networks
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.firewalls import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.images_and_snapshots.images \
import views

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.images_and_snapshots.snapshots \
import views

View File

@ -18,9 +18,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.images_and_snapshots.images \
import urls as image_urls

View File

@ -18,8 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.instances import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.loadbalancers import views

View File

@ -19,8 +19,8 @@
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.network_topology import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.networks.ports import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.networks.subnets import views

View File

@ -14,9 +14,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.networks.ports \
import urls as port_urls

View File

@ -19,8 +19,8 @@
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.overview import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.routers.ports import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.routers.extensions.routerrules\
import views as rr_views

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.stacks import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.volumes import views

View File

@ -16,8 +16,8 @@
#
# @author: Tatiana Mazur
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.project.vpn import views

View File

@ -15,8 +15,8 @@
# @author: Abishek Subramanian, Cisco Systems, Inc.
# @author: Sergey Sudakovich, Cisco Systems, Inc.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.router.nexus1000v import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.settings.password import views

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
from openstack_dashboard.dashboards.settings.user import views

View File

@ -23,10 +23,10 @@ URL patterns for the OpenStack Dashboard.
"""
from django.conf import settings # noqa
from django.conf.urls.defaults import include # noqa
from django.conf.urls.defaults import patterns # noqa
from django.conf.urls.defaults import url # noqa
from django.conf.urls import include # noqa
from django.conf.urls import patterns # noqa
from django.conf.urls.static import static # noqa
from django.conf.urls import url # noqa
from django.contrib.staticfiles.urls import staticfiles_urlpatterns # noqa
import horizon