Skip to content

Commit d55a8dc

Browse files
committed
Merge pull request django-haystack#698 from gjb83/master
Fixed deprecation warning for url imports on Django 1.3 Thanks to @gjb83 for the patch.
2 parents 0a9c919 + 181bee6 commit d55a8dc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

haystack/urls.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
from django.conf.urls.defaults import *
1+
try:
2+
from django.conf.urls import patterns, url
3+
except ImportError:
4+
from django.conf.urls.defaults import patterns, url
25
from haystack.views import SearchView
36

47

0 commit comments

Comments
 (0)