Skip to content

Wagtail 2.12 compatibility #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 25, 2021
Merged

Wagtail 2.12 compatibility #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a7ba5
Fix handling of '&' URL separators in tests
gasman Mar 18, 2021
56c34c4
Add Wagtail 2.12 compatibility
gasman Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/python-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,33 @@ jobs:
- py36-dj22-wt29
- py36-dj22-wt210
- py36-dj22-wt211
- py36-dj22-wt212
- py37-dj22-wt25
- py37-dj22-wt26
- py37-dj22-wt27
- py37-dj22-wt28
- py37-dj22-wt29
- py37-dj22-wt210
- py37-dj22-wt211
- py37-dj22-wt212
- py38-dj22-wt25
- py38-dj22-wt26
- py38-dj22-wt27
- py38-dj22-wt28
- py38-dj22-wt29
- py38-dj22-wt210
- py38-dj22-wt211
- py38-dj22-wt212
- py37-dj30-wt28
- py37-dj30-wt29
- py37-dj30-wt210
- py37-dj30-wt211
- py37-dj30-wt212
- py38-dj30-wt28
- py38-dj30-wt29
- py38-dj30-wt210
- py38-dj30-wt211
- py38-dj30-wt212
include:
- python-version: 3.6
tox_env: py36-dj22-wt25
Expand All @@ -68,6 +73,8 @@ jobs:
tox_env: py36-dj22-wt210
- python-version: 3.6
tox_env: py36-dj22-wt211
- python-version: 3.6
tox_env: py36-dj22-wt212
- python-version: 3.7
tox_env: py37-dj22-wt25
- python-version: 3.7
Expand All @@ -82,6 +89,8 @@ jobs:
tox_env: py37-dj22-wt210
- python-version: 3.7
tox_env: py37-dj22-wt211
- python-version: 3.7
tox_env: py37-dj22-wt212
- python-version: 3.8
tox_env: py38-dj22-wt25
- python-version: 3.8
Expand All @@ -96,6 +105,8 @@ jobs:
tox_env: py38-dj22-wt210
- python-version: 3.8
tox_env: py38-dj22-wt211
- python-version: 3.8
tox_env: py38-dj22-wt212
- python-version: 3.7
tox_env: py37-dj30-wt28
- python-version: 3.7
Expand All @@ -104,6 +115,8 @@ jobs:
tox_env: py37-dj30-wt210
- python-version: 3.7
tox_env: py37-dj30-wt211
- python-version: 3.7
tox_env: py37-dj30-wt212
- python-version: 3.8
tox_env: py38-dj30-wt28
- python-version: 3.8
Expand All @@ -112,6 +125,8 @@ jobs:
tox_env: py38-dj30-wt210
- python-version: 3.8
tox_env: py38-dj30-wt211
- python-version: 3.8
tox_env: py38-dj30-wt212
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
]


install_requires = ["wagtail>=2,<2.12"]
install_requires = [
"wagtail>=2,<2.13",
"Unidecode>=0.04.14,<2.0",
]

documentation_extras = [
"sphinxcontrib-spelling>=2.3.0",
Expand Down
7 changes: 4 additions & 3 deletions tests/templatetags/test_url_replace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from html import unescape
import urllib.parse as urlparse

from ..test_case import AppTestCase
Expand All @@ -11,7 +12,7 @@ def test_kwarg_added(self):
{"request": fake_request},
)
# parse the url as they can be reordered unpredictably
parsed = urlparse.parse_qs(urlparse.urlparse(rendered).query)
parsed = urlparse.parse_qs(urlparse.urlparse(unescape(rendered)).query)
self.assertDictEqual(parsed, {"page": ["1"]})

def test_kwarg_appended(self):
Expand All @@ -21,7 +22,7 @@ def test_kwarg_appended(self):
{"request": fake_request},
)
# parse the url as they can be reordered unpredictably
parsed = urlparse.parse_qs(urlparse.urlparse(rendered).query)
parsed = urlparse.parse_qs(urlparse.urlparse(unescape(rendered)).query)
self.assertDictEqual(parsed, {"foo": ["bar"], "page": ["1"]})

def test_kwarg_replaced(self):
Expand All @@ -31,5 +32,5 @@ def test_kwarg_replaced(self):
{"request": fake_request},
)
# parse the url as they can be reordered unpredictably
parsed = urlparse.parse_qs(urlparse.urlparse(rendered).query)
parsed = urlparse.parse_qs(urlparse.urlparse(unescape(rendered)).query)
self.assertDictEqual(parsed, {"foo": ["bar"], "page": ["5"]})
6 changes: 4 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist =
flake8
py{36,37,38}-dj{22}-wt{25,26,27,28,29,210,211}
py{37,38}-dj{30}-wt{28,29,210,211}
py{36,37,38}-dj{22}-wt{25,26,27,28,29,210,211,212}
py{37,38}-dj{30,31}-wt{28,29,210,211,212}

[gh-actions]
python =
Expand All @@ -17,6 +17,7 @@ deps =

dj22: Django>=2.2.8,<2.3
dj30: Django>=3.0,<3.1
dj31: Django>=3.1,<3.2
wt23: wagtail>=2.3,<2.4
wt24: wagtail>=2.4,<2.5
wt25: wagtail>=2.5,<2.6
Expand All @@ -26,6 +27,7 @@ deps =
wt29: wagtail>=2.9,<2.10
wt210: wagtail>=2.10,<2.11
wt211: wagtail>=2.11,<2.12
wt212: wagtail>=2.12,<2.13


commands =
Expand Down
8 changes: 6 additions & 2 deletions wagtailstreamforms/models/form.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from django.db import models
from django.utils.translation import ugettext_lazy as _
from wagtail import VERSION as WAGTAIL_VERSION
from wagtail.admin.edit_handlers import (
FieldPanel,
MultiFieldPanel,
Expand Down Expand Up @@ -162,9 +163,12 @@ def get_form_class(self):
return FormBuilder(self.get_form_fields()).get_form_class()

def get_form_fields(self):
""" Returns the form fields stream_data. """
""" Returns the form field's stream data. """

form_fields = self.fields.stream_data
if WAGTAIL_VERSION >= (2, 12):
form_fields = self.fields.raw_data
else:
form_fields = self.fields.stream_data
for fn in hooks.get_hooks("construct_submission_form_fields"):
form_fields = fn(form_fields)
return form_fields
Expand Down