diff --git a/categories/urls.py b/categories/urls.py index a6aa6fd..333c6b7 100644 --- a/categories/urls.py +++ b/categories/urls.py @@ -1,13 +1,23 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from .models import Category +try: + from django.views.generic import DetailView, ListView +except ImportError: + try: + from cbv import DetailView, ListView + except ImportError: + from django.core.exceptions import ImproperlyConfigured + raise ImproperlyConfigured("For older versions of Django, you need django-cbv.") + + categorytree_dict = { 'queryset': Category.objects.filter(level=0) } -urlpatterns = patterns('django.views.generic.list_detail', +urlpatterns = patterns('', url( - r'^$', 'object_list', categorytree_dict, name='categories_tree_list' + r'^$', ListView.as_view(**categorytree_dict), name='categories_tree_list' ), ) diff --git a/example/settings.py b/example/settings.py index 012dab6..75900f9 100644 --- a/example/settings.py +++ b/example/settings.py @@ -123,7 +123,7 @@ CATEGORIES_SETTINGS = { }, } -if django.VERSION[1] == 4: +if django.VERSION[1] >= 4: from settings14 import * if django.VERSION[1] == 3: from settings13 import * diff --git a/example/urls.py b/example/urls.py index c8e1a75..a15924d 100644 --- a/example/urls.py +++ b/example/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -13,7 +13,7 @@ urlpatterns = patterns('', # Example: # (r'^sample/', include('sample.foo.urls')), - # Uncomment the admin/doc line below and add 'django.contrib.admindocs' + # Uncomment the admin/doc line below and add 'django.contrib.admindocs' # to INSTALLED_APPS to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), @@ -32,4 +32,4 @@ urlpatterns = patterns('', (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(ROOT_PATH, 'example', 'static')}), -) \ No newline at end of file +)