Fix Django 1.6 support, use new django.conf.urls import path.

Author: vdboor

CHANGES.rst

@@ -2,6 +2,7 @@ Changes in version 0.8.7 (beta release)
 ---------------------------------------
 
 * Fix Django 1.5 support in the templates
+* Fix Django 1.6 support, use new ``django.conf.urls`` import path.
 
 
 Changes in version 0.8.6 (beta release)

polymorphic_tree/admin/parentadmin.py

@@ -1,8 +1,6 @@
 from django.conf import settings
-from django.conf.urls.defaults import url
+from django.conf.urls import url
 from django.core.urlresolvers import reverse
-from django.db import router
-from django.db.models import signals
 from django.db.transaction import commit_on_success
 from django.http import HttpResponseNotFound, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect
 from django.utils import simplejson
@@ -11,6 +9,13 @@
 from polymorphic_tree.models import PolymorphicMPTTModel
 from mptt.admin import MPTTModelAdmin
 
+try:
+ # Django 1.6 requires this
+ from django.conf.urls import url
+except ImportError:
+ # Django 1.3 compatibility
+ from django.conf.urls.defaults import url
+
 
 class NodeTypeChoiceForm(PolymorphicModelChoiceForm):
  type_label = _("Node type")