OpenLP

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

  1. 25bugfixes5
  2. Merge into trunk
Proposed by Tomas Groth
Status: Merged
Merged at revision: 2697
Proposed branch: lp://qastaging/~tomasgroth/openlp/25bugfixes5
Merge into: lp://qastaging/openlp
Diff against target: 96 lines (+30/-6)
5 files modified
openlp/plugins/bibles/lib/importers/http.py (+1/-1)
openlp/plugins/songs/lib/importers/mediashout.py (+1/-1)
openlp/plugins/songs/lib/importers/songimport.py (+5/-2)
tests/functional/openlp_plugins/songs/test_mediashout.py (+7/-2)
tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+16/-0)
To merge this branch: bzr merge lp://qastaging/~tomasgroth/openlp/25bugfixes5
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Phill Approve
Review via email: mp+306676@code.qastaging.launchpad.net

Description of the change

Fixes getting bible texts from CrossWalk
Fix to handling of form feed char and vertical tab char.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

lp:~tomasgroth/openlp/25bugfixes5 (revision 2700)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1781/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1692/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1630/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1386/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/976/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1044/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/912/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/75/

Revision history for this message
Phill (phill-ridout) wrote :

Looks ok to me, but I've not tested it!

review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.