OpenLP

Merge lp://qastaging/~thelinuxguy/openlp/flake-fixes into lp://qastaging/openlp

  1. flake-fixes
  2. Merge into trunk
Proposed by Simon Hanna
Status: Needs review
Proposed branch: lp://qastaging/~thelinuxguy/openlp/flake-fixes
Merge into: lp://qastaging/openlp
Diff against target: 275 lines (+18/-27)
17 files modified
openlp/core/app.py (+1/-1)
openlp/core/lib/serviceitem.py (+1/-1)
openlp/core/projectors/editform.py (+0/-3)
openlp/core/ui/advancedtab.py (+1/-1)
openlp/core/ui/exceptiondialog.py (+1/-1)
openlp/core/ui/slidecontroller.py (+1/-1)
openlp/core/version.py (+0/-3)
openlp/core/widgets/edits.py (+1/-1)
openlp/core/widgets/wizard.py (+0/-1)
openlp/plugins/alerts/endpoint.py (+0/-1)
openlp/plugins/bibles/bibleplugin.py (+1/-1)
openlp/plugins/bibles/forms/bibleimportform.py (+2/-2)
openlp/plugins/bibles/lib/importers/csvbible.py (+0/-1)
openlp/plugins/presentations/lib/mediaitem.py (+1/-1)
openlp/plugins/songs/lib/importers/easyslides.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+3/-3)
tests/openlp_core/projectors/test_projector_pjlink_commands_01.py (+4/-4)
To merge this branch: bzr merge lp://qastaging/~thelinuxguy/openlp/flake-fixes
Reviewer Review Type Date Requested Status
Phill Needs Information
Review via email: mp+353535@code.qastaging.launchpad.net

Description of the change

A couple of code fixes that I uncovered using linters

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

I'm not sure about those patches that were changed (see in line) isn't patching supposed to take place in the module they're imported in to?

review: Needs Information
Reply
Revision history for this message
Simon Hanna (thelinuxguy) wrote :

I'm not sure if that makes a difference here, but when viewing it in the tests using the original definition shows what is actually being used. If you import it from somewhere else you could think that it's something different...

Reply

Unmerged revisions

2839. By Simon Hanna

Remove useless statements

2838. By Simon Hanna

Remove unused variable

2837. By Simon Hanna

Remove unused variable

2836. By Simon Hanna

Method expects Path and not str

2835. By Simon Hanna

Use proper Error in except clause

2834. By Simon Hanna

Add missing asserts

2833. By Simon Hanna

Fixup more hacks

2832. By Simon Hanna

Fix ugly hack in test

2831. By Simon Hanna

Remove unused imports

2830. By Simon Hanna

Remove unused import

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.