OpenLP

Merge lp://qastaging/~phill-ridout/openlp/more-bible-refactors into lp://qastaging/openlp

  1. more-bible-refactors
  2. Merge into trunk
Proposed by Phill
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2700
Merged at revision: 2692
Proposed branch: lp://qastaging/~phill-ridout/openlp/more-bible-refactors
Merge into: lp://qastaging/openlp
Diff against target: 2631 lines (+999/-1092)
24 files modified
openlp/core/common/__init__.py (+22/-0)
openlp/core/lib/exceptions.py (+7/-1)
openlp/plugins/bibles/bibleplugin.py (+0/-42)
openlp/plugins/bibles/forms/__init__.py (+3/-21)
openlp/plugins/bibles/forms/bibleimportform.py (+1/-1)
openlp/plugins/bibles/forms/bibleupgradeform.py (+0/-575)
openlp/plugins/bibles/lib/bibleimport.py (+113/-0)
openlp/plugins/bibles/lib/db.py (+1/-136)
openlp/plugins/bibles/lib/importers/csvbible.py (+113/-100)
openlp/plugins/bibles/lib/importers/http.py (+5/-8)
openlp/plugins/bibles/lib/importers/opensong.py (+7/-26)
openlp/plugins/bibles/lib/importers/osis.py (+58/-79)
openlp/plugins/bibles/lib/importers/sword.py (+9/-10)
openlp/plugins/bibles/lib/importers/zefania.py (+19/-45)
openlp/plugins/bibles/lib/manager.py (+6/-7)
tests/functional/openlp_core_common/test_init.py (+64/-3)
tests/functional/openlp_plugins/bibles/test_bibleimport.py (+212/-0)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+338/-17)
tests/functional/openlp_plugins/bibles/test_http.py (+6/-6)
tests/functional/openlp_plugins/bibles/test_opensongimport.py (+3/-3)
tests/functional/openlp_plugins/bibles/test_osisimport.py (+5/-5)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+3/-3)
tests/functional/openlp_plugins/bibles/test_zefaniaimport.py (+3/-3)
tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/more-bible-refactors
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+302588@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-08-09.

To post a comment you must log in.
Revision history for this message
Phill (phill-ridout) wrote : Posted in a previous version of this proposal

--------------------------------
lp:~phill-ridout/openlp/more-bible-refactors (revision 2693)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1705/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1616/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1554/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1317/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/907/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/975/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/843/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/22/

Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

See inline.
Good major simplification.
Do all the files need to be in bibles.lib

Could we have bibles.importers for the actual importers?

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) : Posted in a previous version of this proposal
review: Needs Fixing
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.