From b738944fcf57cda392e23c0802047652dc3db183 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Wed, 19 Aug 2009 23:50:30 +0000 Subject: [PATCH] Use hasattr instead of checking for django version number to check for the new admin.site.urls (django 1.1 compatibility) --- htsworkflow/frontend/urls.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py index d08a75d..b0423bd 100644 --- a/htsworkflow/frontend/urls.py +++ b/htsworkflow/frontend/urls.py @@ -54,14 +54,10 @@ urlpatterns = patterns('', ) # Allow admin -if django.VERSION >= (1, 1, 0, 'final', 0): - urlpatterns += patterns('', - (r'^admin/', include(admin.site.urls)), - ) -else: - urlpatterns += patterns('', - (r'^admin/(.*)', admin.site.root), - ) +if hasattr(admin.site, 'urls'): + urlpatterns += patterns('', (r'^admin/', include(admin.site.urls))) +else: + urlpatterns += patterns('', (r'^admin/(.*)', admin.site.root)) if settings.DEBUG: urlpatterns += patterns('', -- 2.30.2