Merge branch 'threadsafe_requestholder' into update_django

[osqa.git] / urls.py

diff --git a/urls.py b/urls.py
index 0355657c9d3d7d279c19009ea10398fa90c3da94..e56bc01331e7ad3e6e8e5e252c73a94df0df2411 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
@@ -7,7 +7,9 @@ urlpatterns = patterns('',
 )
 
 if 'rosetta' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
+    urlpatterns = patterns('',
         url(r'^rosetta/', include('rosetta.urls')),
-    )
+    ) + urlpatterns
 
+handler404 = 'forum.views.meta.page'
+handler500 = 'forum.views.meta.error_handler'