Merge pull request #24 from hylje/master

Forwards compatibility to Django 1.6
kangasbros · Nov 25, 2013 · 29ef0a5 · 29ef0a5
2 parents 2612648 + 97b8d55
commit 29ef0a5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/django_bitcoin/urls.py b/django_bitcoin/urls.py
@@ -1,5 +1,8 @@
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import patterns, url
+except ImportError:
+    from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('django_bitcoin.views',
-    url(r'qrcode/(?P<key>.+)$','qrcode_view',name='qrcode'),
-)
+    url(r'^qrcode/(?P<key>.+)$','qrcode_view',name='qrcode'),
+)