diff --git a/zebra/templatetags/zebra_tags.py b/zebra/templatetags/zebra_tags.py index 60db3d7..a2335d0 100644 --- a/zebra/templatetags/zebra_tags.py +++ b/zebra/templatetags/zebra_tags.py @@ -1,7 +1,7 @@ -from django.core.urlresolvers import reverse +from django.urls import reverse from django import template from django.template.loader import render_to_string -from django.utils.encoding import force_unicode +from django.utils.encoding import force_text as force_unicode from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ @@ -10,12 +10,13 @@ register = template.Library() + def _set_up_zebra_form(context): if not "zebra_form" in context: if "form" in context: context["zebra_form"] = context["form"] else: - raise Exception, "Missing stripe form." + raise Exception("Missing stripe form.") context["STRIPE_PUBLISHABLE"] = options.STRIPE_PUBLISHABLE return context diff --git a/zebra/urls.py b/zebra/urls.py index 31608c6..c0b8752 100644 --- a/zebra/urls.py +++ b/zebra/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from zebra import views -urlpatterns = patterns('', +urlpatterns = [ url(r'webhooks/$', views.webhooks, name='webhooks'), url(r'webhooks/v2/$', views.webhooks_v2, name='webhooks_v2'), -) +] diff --git a/zebra/views.py b/zebra/views.py index 4becfe4..fb9ca1c 100644 --- a/zebra/views.py +++ b/zebra/views.py @@ -4,7 +4,7 @@ except: from django.utils import simplejson -from django.db.models import get_model +from django.apps import apps import stripe from zebra.conf import options from zebra.signals import * @@ -17,7 +17,7 @@ def _try_to_get_customer_from_customer_id(stripe_customer_id): if options.ZEBRA_CUSTOMER_MODEL: - m = get_model(*options.ZEBRA_CUSTOMER_MODEL.split('.')) + m = apps.get_model(*options.ZEBRA_CUSTOMER_MODEL.split('.')) try: return m.objects.get(stripe_customer_id=stripe_customer_id) except: diff --git a/zebra/widgets.py b/zebra/widgets.py index d3eaa98..379db41 100644 --- a/zebra/widgets.py +++ b/zebra/widgets.py @@ -25,7 +25,6 @@ class Media: js = ('zebra/card-form.js', 'https://js.stripe.com/v1/') - class NoNameTextInput(TextInput, NoNameWidget): def render(self, name, *args, **kwargs): diff --git a/zebra_sample_project/urls.py b/zebra_sample_project/urls.py index f5f927c..ec52cef 100644 --- a/zebra_sample_project/urls.py +++ b/zebra_sample_project/urls.py @@ -1,6 +1,6 @@ -from django.conf.urls.defaults import patterns, include, url +from django.conf.urls.defaults import include, url -urlpatterns = patterns('', +urlpatterns = [ url(r'zebra/', include('zebra.urls', namespace="zebra", app_name='zebra') ), url(r'', include('marty.urls', namespace="marty", app_name='marty') ), -) +]