From bb14134233008fa301ec2c54495c99f38a1d99db Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 14 Sep 2012 21:53:55 +0200 Subject: [PATCH] Fix bug #1051051 where "4-5" style verses would fail. Now they are imported as "4" Fixes: https://launchpad.net/bugs/1051051 --- openlp/plugins/bibles/lib/http.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index a223465da..329acb5ba 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -155,7 +155,14 @@ class BGExtract(object): text = text.replace(old, new) text = u' '.join(text.split()) if verse and text: - verses.append((int(verse.strip()), text)) + verse = verse.strip() + try: + verse = int(verse) + except (TypeError, ValueError): + verse_parts = verse.split(u'-') + if len(verse_parts) > 1: + verse = int(verse_parts[0]) + verses.append((verse, text)) verse_list = {} for verse, text in verses[::-1]: verse_list[verse] = text