OpenLP

Merge lp://qastaging/~tomasgroth/openlp/25bugfixes4 into lp://qastaging/openlp

25bugfixes4
Merge into trunk

Proposed by Tomas Groth on 2016-07-27

Status:	Merged
Approved by:	Raoul Snyman on 2016-07-27
Approved revision:	2685
Merged at revision:	2683
Proposed branch:	lp://qastaging/~tomasgroth/openlp/25bugfixes4
Merge into:	lp://qastaging/openlp
Diff against target:	316 lines (+132/-31) 7 files modified openlp/plugins/bibles/lib/http.py (+28/-22) openlp/plugins/songs/lib/importers/easyslides.py (+1/-1) openlp/plugins/songs/lib/importers/videopsalm.py (+8/-0) tests/functional/openlp_plugins/songs/test_videopsalm.py (+2/-0) tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+11/-8) tests/resources/videopsalmsongs/as-safe-a-stronghold2.json (+35/-0) tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json (+47/-0)
To merge this branch:	bzr merge lp://qastaging/~tomasgroth/openlp/25bugfixes4
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Raoul Snyman		2016-07-27	Approve on 2016-07-27
Review via email: mp+301314@code.qastaging.launchpad.net

Description of the change

Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.
Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.
Make easyslide importer try to recover when reading non-standard xml. Fixes bug 1588822.
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.