lp:~phill-ridout/openlp/even-more-refactors

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2696

Tim Bentley: Approve on 2016-09-15

Tomas Groth: Approve on 2016-09-15

Diff: 3154 lines (+1623/-771)

24 files modified

openlp/core/common/openlpmixin.py (+6/-0)
openlp/plugins/bibles/bibleplugin.py (+4/-4)
openlp/plugins/bibles/forms/bibleimportform.py (+24/-16)
openlp/plugins/bibles/lib/__init__.py (+2/-2)
openlp/plugins/bibles/lib/bibleimport.py (+150/-29)
openlp/plugins/bibles/lib/db.py (+2/-62)
openlp/plugins/bibles/lib/importers/csvbible.py (+15/-31)
openlp/plugins/bibles/lib/importers/opensong.py (+112/-95)
openlp/plugins/bibles/lib/importers/osis.py (+93/-97)
openlp/plugins/bibles/lib/importers/zefania.py (+4/-3)
openlp/plugins/bibles/lib/manager.py (+3/-3)
openlp/plugins/bibles/lib/upgrade.py (+2/-164)
tests/functional/openlp_core_ui/test_exceptionform.py (+1/-6)
tests/functional/openlp_plugins/bibles/test_bibleimport.py (+437/-34)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+11/-77)
tests/functional/openlp_plugins/bibles/test_db.py (+1/-55)
tests/functional/openlp_plugins/bibles/test_opensongimport.py (+343/-31)
tests/functional/openlp_plugins/bibles/test_osisimport.py (+367/-14)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_zefaniaimport.py (+5/-7)
tests/resources/bibles/dk1933.json (+10/-10)
tests/resources/bibles/kjv.json (+10/-10)
tests/resources/bibles/rst.json (+10/-10)
tests/resources/bibles/web.json (+10/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2707. By Phill on 2016-09-09

PEP fixes

2706. By Phill on 2016-09-09

Doc string

2705. By Phill on 2016-09-05

More BibleImport tests

2704. By Phill on 2016-09-05

Missed an attribute

2703. By Phill on 2016-09-04

Moved some import related stuff out of the db module

2702. By Phill on 2016-09-04

Move already refactored imorters over to using the log methods in OpenLPMixin

2701. By Phill on 2016-09-02

PEP fixes

2700. By Phill on 2016-09-02

Mostly refactors of OSIS + tests

2699. By Phill on 2016-08-29

Moved validate_xml in to bible import and improved operation. More tests

2698. By Phill on 2016-08-28

Start on osis importer. Some further improvements of other importers