From: Diane Trout <diane@caltech.edu>
Date: Wed, 19 Aug 2009 23:50:30 +0000 (+0000)
Subject: Use hasattr instead of checking for django version number to check
X-Git-Tag: 0.3.0~8
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=b738944fcf57cda392e23c0802047652dc3db183

Use hasattr instead of checking for django version number to check
for the new admin.site.urls (django 1.1 compatibility)
---

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('',