lp:~sam92/openlp/bug-1533081

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2609

Raoul Snyman: Approve on 2016-01-16

Tim Bentley: Approve on 2016-01-15

Diff: 249 lines (+122/-23)

3 files modified

openlp/core/utils/__init__.py (+1/-1)
openlp/plugins/songs/lib/importers/openlp.py (+32/-22)
tests/utils/test_pep8.py (+89/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1533081: Importing Song DB fails	High	Fix Released
Bug #1534306: Empty song-titles causes tracebacks on update from 2.0 to 2.2	High	Fix Released

Link a bug report

Related blueprints

2615. By Samuel Mehrbrodt on 2016-01-15

No need to skip that, it's not ran at all on ci

2614. By Samuel Mehrbrodt on 2016-01-15

Skip pep8 test on CI

2613. By Samuel Mehrbrodt on 2016-01-15

Merge trunk

2612. By Samuel Mehrbrodt on 2016-01-15

PEP8

2611. By Samuel Mehrbrodt on 2016-01-15

Fix test

2610. By Samuel Mehrbrodt on 2016-01-15

Add pep8 test

2609. By Samuel Mehrbrodt on 2016-01-15

Fix importing songs with empty title

2608. By Samuel Mehrbrodt on 2016-01-15

Remove temp file after finishing

2607. By Samuel Mehrbrodt on 2016-01-15

Migrate dbs before importing

2606. By Tim Bentley on 2016-01-12

Fix search