Permalink
Browse files

django 1.3 contains urls utils in django.cong.urls.defaults

  • Loading branch information...
1 parent 8b334c3 commit 6bad37e1b4a1a03444428f1c8a61b97bdd1000de @GeyseR GeyseR committed Mar 7, 2013
Showing with 16 additions and 5 deletions.
  1. +4 −2 pybb/urls.py
  2. +4 −1 test/example_bootstrap/urls.py
  3. +4 −1 test/example_thirdparty/urls.py
  4. +4 −1 test/test_project/test_urls.py
View
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
-
-from django.conf.urls import *
+try:
+ from django.conf.urls import patterns, include, url
+except ImportError:
+ from django.conf.urls.defaults import patterns, include, url
from pybb.feeds import LastPosts, LastTopics
from pybb.views import IndexView, CategoryView, ForumView, TopicView,\
@@ -1,4 +1,7 @@
-from django.conf.urls.defaults import patterns, include, url
+try:
+ from django.conf.urls import patterns, include, url
+except ImportError:
+ from django.conf.urls.defaults import patterns, include, url
from django.contrib import admin
admin.autodiscover()
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
-from django.conf.urls import patterns, include, url
+try:
+ from django.conf.urls import patterns, include, url
+except ImportError:
+ from django.conf.urls.defaults import patterns, include, url
from django.contrib import admin
admin.autodiscover()
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
-from django.conf.urls import patterns, include, url
+try:
+ from django.conf.urls import patterns, include, url
+except ImportError:
+ from django.conf.urls.defaults import patterns, include, url
from django.contrib import admin
admin.autodiscover()

0 comments on commit 6bad37e

Please sign in to comment.