Permalink
Browse files

Fixed ImportError when running tests with Django 1.6 trunk.

  • Loading branch information...
1 parent d961422 commit c6a44636914d9409071ca84160e7631acda55877 @zsiciarz committed Feb 2, 2013
Showing with 6 additions and 1 deletion.
  1. +6 −1 envelope/tests/urls.py
@@ -1,4 +1,9 @@
-from django.conf.urls.defaults import include, patterns, url
+try:
+ # Django 1.5 and below.
+ from django.conf.urls.defaults import patterns, include, url
+except ImportError:
+ # Django 1.6+
+ from django.conf.urls import patterns, include, url
from envelope.views import ContactView

0 comments on commit c6a4463

Please sign in to comment.