Merge pull request #6 from Wirzi/master

Update MANIFEST.in to include templates, Django 1.6 compatibility
powellc · Jan 30, 2014 · 1efaedb · 1efaedb
2 parents f605992 + 837ceaf
commit 1efaedb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
 include README
-recursive-include templates *.html
+recursive-include shop_stripe/templates *
diff --git a/shop_stripe/offsite_stripe.py b/shop_stripe/offsite_stripe.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 from django.conf import settings
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from shop.util.decorators import on_method, shop_login_required