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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2692

Raoul Snyman: Approve on 2016-08-12

Tim Bentley: Approve on 2016-08-10

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1624850: CSV Bible importer has problems with special characters	Low	Fix Committed
Bug #1742390: CSV bible import fails UnicodeDecodeError: '	Low	Fix Committed

Link a bug report

Related blueprints

2700. By Phill on 2016-08-10

Stylistic changes

2699. By Phill on 2016-08-09

pep fixes

2698. By Phill on 2016-08-09

test fixes

2697. By Phill on 2016-08-09

Moved importers in to dedicated directory

2696. By Phill on 2016-08-09

Add OpenLPMixin to bible importer

2695. By Phill on 2016-08-09

Removed old bible upgrade form

2694. By Phill on 2016-08-09

Moved get file encoding from lib to common

2693. By Phill on 2016-08-08

PEP fixes

2692. By Phill on 2016-08-08

Refactor csv importer

2691. By Phill on 2016-08-08

head