lp:~phill-ridout/openlp/bible_proxies
- Get this branch:
- bzr branch lp:~phill-ridout/openlp/bible_proxies
Branch merges
- Tomas Groth: Approve
-
Diff: 611 lines (+304/-101)8 files modifiedopenlp/core/common/settings.py (+5/-1)
openlp/plugins/bibles/bibleplugin.py (+0/-4)
openlp/plugins/bibles/forms/bibleimportform.py (+11/-53)
openlp/plugins/bibles/lib/db.py (+4/-5)
openlp/plugins/bibles/lib/importers/http.py (+12/-33)
openlp/plugins/bibles/lib/manager.py (+0/-4)
openlp/plugins/bibles/lib/upgrade.py (+54/-1)
tests/functional/openlp_plugins/bibles/test_upgrade.py (+218/-0)
Related source package recipes
Recent revisions
- 2834. By Phill
-
Remove proxy settings from individual bibles and use the centeral OpenLP proxy server settings.
- 2833. By Raoul Snyman
-
Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal.
- 2830. By Simon Hanna
-
Rework a couple of imports. Now a subset of tests can be run again, which previously failed due to circular imports (at least that's what I guess)
- 2829. By Simon Hanna
-
Instead of raising an error when converting paths, return None and log an error.
The method is allowed to return None, so calling functions should handle that. Raising an error is very rude behavior and the output just said that the input was invalid with no real clue as to what is wrong.
Now None is returned without causing too much hassle, and a proper error is logged mentioning what exactly caused the error.
The test case was updated.
This is sort of related to https:/
/bugs.launchpad .net/openlp/ +bug/1786601 in that this would have been nice to actually know what went wrong and failback to None.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp
