Commit 4b5691d8 authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

wheezy: urls module doesn't export defaults

parent 934feea8
......@@ -32,7 +32,11 @@
# or implied, of GRNET S.A.
from functools import partial
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.proxy import proxy
from snf_django.lib.api.utils import prefix_pattern
from snf_django.lib.api.urls import api_patterns
......
......@@ -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 snf_django.lib.api.utils import prefix_pattern
from synnefo_stats.stats_settings import BASE_PATH
from synnefo_stats.grapher import grapher
......
......@@ -33,7 +33,13 @@
import os
from django.conf.urls.defaults import *
# Import * in order to import the http exception handlers: handler*
try:
from django.conf.urls.defaults import *
except ImportError: # Django==1.4
from django.conf.urls import *
from synnefo.util.entry_points import extend_urls
from django.utils.importlib import import_module
from django.template import Context, loader, RequestContext
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment