Skip to content

Commit

Permalink
Updated imports of reverse and NoReverseMatch for Django 2.0
Browse files Browse the repository at this point in the history
Regards #687
  • Loading branch information
michael-k committed May 23, 2017
1 parent 1e433f0 commit abf0bab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
7 changes: 5 additions & 2 deletions crispy_forms/tests/test_form_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import django
from django import forms
from django.core.urlresolvers import reverse
from django.forms.models import formset_factory
from django.template import Context, Template, TemplateSyntaxError
from django.test.html import parse_html
Expand Down Expand Up @@ -35,7 +34,11 @@
except ImportError:
from django.middleware.csrf import _get_new_csrf_string as _get_new_csrf_key


try:
from django.urls import reverse
except ImportError:
# Django < 1.10
from django.core.urlresolvers import reverse


def test_inputs(settings):
Expand Down
8 changes: 6 additions & 2 deletions crispy_forms/tests/test_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import django
from django import forms
from django.core.urlresolvers import reverse
from django.forms.models import formset_factory, modelformset_factory
from django.shortcuts import render_to_response
from django.template import Context, Template
Expand Down Expand Up @@ -33,6 +32,12 @@
except ImportError:
from django.middleware.csrf import _get_new_csrf_string as _get_new_csrf_key

try:
from django.urls import reverse
except ImportError:
# Django < 1.10
from django.core.urlresolvers import reverse


def test_invalid_unicode_characters(settings):
# Adds a BooleanField that uses non valid unicode characters "ñ"
Expand Down Expand Up @@ -595,4 +600,3 @@ def test_bootstrap4_form_inline():
assert html.count('id="div_id_email" class="form-group"') == 1
assert html.count('placeholder="email"') == 1
assert html.count('</label> <input') == 3

2 changes: 1 addition & 1 deletion docs/form_helper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Helper attributes you can set

Sometimes you may want to add arguments to the URL, for that you will have to do in your view::

from django.core.urlresolvers import reverse
from django.urls import reverse
form.helper.form_action = reverse('url_name', args=[event.id])
form.helper.form_action = reverse('url_name', kwargs={'book_id': book.id})

Expand Down

0 comments on commit abf0bab

Please sign in to comment.