wheezy: urls module doesn't export defaults

snf-astakos-app/astakos/api/keystone_urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import patterns, url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url
+
 from snf_django.lib.api import api_endpoint_not_found
 
 urlpatterns = patterns(

snf-astakos-app/astakos/api/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns, url, include
+try:
+    from django.conf.urls import patterns, url, include
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url, include
+
 from snf_django.lib.api import api_endpoint_not_found
 
 

snf-astakos-app/astakos/im/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import patterns, url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url
+
 
 from astakos.im.forms import (
     ExtendedPasswordResetForm,

snf-astakos-app/astakos/im/weblogin_urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import url
+
 
 urlpatterns = (
     url(r'^login$', 'astakos.im.views.target.redirect.login',

snf-astakos-app/astakos/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import include, patterns
+try:
+    from django.conf.urls import include, patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import include, patterns
+
 from synnefo.lib import join_urls
 from astakos.im.settings import (
     BASE_PATH, ACCOUNTS_PREFIX, VIEWS_PREFIX, KEYSTONE_PREFIX, WEBLOGIN_PREFIX)

snf-cyclades-app/synnefo/admin/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import url, patterns
+try:
+    from django.conf.urls import url, patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import url, patterns
+
 from synnefo.admin import views
 from django.http import Http404
 

snf-cyclades-app/synnefo/api/extensions.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns
+try:
+    from django.conf.urls import patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns
+
 from django.http import HttpResponse
 from django.utils import simplejson as json
 from snf_django.lib import api

snf-cyclades-app/synnefo/api/flavors.py

@@ -33,7 +33,11 @@
 
 from logging import getLogger
 
-from django.conf.urls.defaults import patterns
+try:
+    from django.conf.urls import patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns
+
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import simplejson as json

snf-cyclades-app/synnefo/api/images.py

@@ -36,7 +36,11 @@ from itertools import ifilter
 
 from dateutil.parser import parse as date_parse
 
-from django.conf.urls.defaults import patterns
+try:
+    from django.conf.urls import patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns
+
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import simplejson as json

snf-cyclades-app/synnefo/api/networks.py

@@ -33,7 +33,11 @@
 
 
 from django.conf import settings
-from django.conf.urls.defaults import patterns
+try:
+    from django.conf.urls import patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns
+
 from django.db import transaction
 from django.db.models import Q
 from django.http import HttpResponse

snf-cyclades-app/synnefo/api/servers.py

@@ -34,7 +34,11 @@
 import datetime
 from django import dispatch
 from django.conf import settings
-from django.conf.urls.defaults import patterns
+try:
+    from django.conf.urls import patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns
+
 from django.db import transaction
 from django.http import HttpResponse
 from django.template.loader import render_to_string

snf-cyclades-app/synnefo/api/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import include, patterns
+try:
+    from django.conf.urls import include, patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import include, patterns
+
 
 from snf_django.lib.api import api_endpoint_not_found
 from synnefo.api import servers, flavors, images, networks, extensions

snf-cyclades-app/synnefo/app_settings/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import patterns, include
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, include
+
 from django.conf import settings
 from snf_django.lib.api.proxy import proxy
 from snf_django.lib.api.utils import prefix_pattern

snf-cyclades-app/synnefo/helpdesk/urls.py

-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import patterns, url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url
+
 
 urlpatterns = patterns('',
     url(r'^$', 'synnefo.helpdesk.views.index', name='helpdesk-index'),

snf-cyclades-app/synnefo/plankton/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns, include
+try:
+    from django.conf.urls import patterns, include
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, include
+
 from django.http import HttpResponseNotAllowed
 from snf_django.lib.api import api_endpoint_not_found
 

snf-cyclades-app/synnefo/ui/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 #
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import patterns, url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url
+
 from django.conf import settings
 import os
 

snf-cyclades-app/synnefo/userdata/urls.py

@@ -32,7 +32,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls import patterns, url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url
+
 from synnefo.userdata import views
 from django.http import Http404
 

snf-cyclades-app/synnefo/vmapi/urls.py

@@ -31,7 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import patterns, url
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns, url
+
 from snf_django.lib.api import api_endpoint_not_found
 
 urlpatterns = patterns('synnefo.vmapi.views',

snf-django-lib/snf_django/lib/api/urls.py

@@ -33,7 +33,11 @@
 
 from django.core import urlresolvers
 from django.views.decorators import csrf
-from django.conf.urls.defaults import patterns
+try:
+    from django.conf.urls import patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import patterns
+
 
 
 def _patch_pattern(regex_pattern):

snf-django-lib/snf_django/utils/urls.py

@@ -32,7 +32,11 @@
 # or implied, of GRNET S.A.
 
 
-from django.conf.urls.defaults import url, patterns
+try:
+    from django.conf.urls import url, patterns
+except ImportError:  # Django==1.2
+    from django.conf.urls.defaults import url, patterns
+
 from snf_django.lib.api.utils import prefix_pattern
 from synnefo.lib.services import get_service_path
 from synnefo.lib import join_urls