Merge lp:~abompard/postorius/django16 into lp:postorius

Proposed by Aurélien Bompard
Status: Merged
Merged at revision: 248
Proposed branch: lp:~abompard/postorius/django16
Merge into: lp:postorius
Diff against target: 15 lines (+4/-1)
1 file modified
src/postorius/fieldset_forms.py (+4/-1)
To merge this branch: bzr merge lp:~abompard/postorius/django16
Reviewer Review Type Date Requested Status
Florian Fuchs Approve
Review via email: mp+257517@code.launchpad.net

Description of the change

Very simple fix for Django 1.6 compatibility (found because the tests failed).

To post a comment you must log in.
Revision history for this message
Florian Fuchs (flo-fuchs) wrote :

Hi Aurélien,

thanks for the fix! Merged.

Florian

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/postorius/fieldset_forms.py'
--- src/postorius/fieldset_forms.py 2015-04-16 17:01:31 +0000
+++ src/postorius/fieldset_forms.py 2015-04-27 11:59:41 +0000
@@ -19,7 +19,10 @@
19from django.forms import Form19from django.forms import Form
20from django.utils import safestring20from django.utils import safestring
21from django.forms.forms import BoundField21from django.forms.forms import BoundField
22from django.forms.utils import ErrorList22try:
23 from django.forms.utils import ErrorList
24except ImportError:
25 from django.forms.util import ErrorList # Django 1.6
2326
2427
25class FieldsetError(Exception):28class FieldsetError(Exception):

Subscribers

People subscribed via source and target branches