OpenLP

Merge lp://qastaging/~tomasgroth/openlp/videopsalm-fix-24 into lp://qastaging/openlp/2.4

  1. videopsalm-fix-24
  2. Merge into 2.4
Proposed by Tomas Groth
Status: Merged
Merged at revision: 2640
Proposed branch: lp://qastaging/~tomasgroth/openlp/videopsalm-fix-24
Merge into: lp://qastaging/openlp/2.4
Diff against target: 120 lines (+92/-0)
4 files modified
openlp/plugins/songs/lib/importers/videopsalm.py (+8/-0)
tests/functional/openlp_plugins/songs/test_videopsalm.py (+2/-0)
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/videopsalm-fix-24
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+298065@code.qastaging.launchpad.net

Description of the change

Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.

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

lp:~tomasgroth/openlp/videopsalm-fix-24 (revision 2638)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1631/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1542/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1480/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1249/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/839/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/907/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/775/

lp://qastaging/~tomasgroth/openlp/videopsalm-fix-24 updated
2639. By Tomas Groth

merge trunk

Revision history for this message
Tomas Groth (tomasgroth) wrote :

Merged 2.4-trunk.

lp:~tomasgroth/openlp/videopsalm-fix-24 (revision 2639)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1632/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1543/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1481/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1250/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/840/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/908/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/776/

Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
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.

Subscribers

People subscribed via source and target branches

to all changes: