← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~phill-ridout/openlp/1194730_2.0 into lp:openlp/2.0

 

Phill has proposed merging lp:~phill-ridout/openlp/1194730_2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1194730 in OpenLP: "[support-system] Non existing chapters reseult in traceback when searching webbibles"
  https://bugs.launchpad.net/openlp/+bug/1194730

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/1194730_2.0/+merge/178437

Fixes 1194730 by checking that a div is actually returned
-- 
https://code.launchpad.net/~phill-ridout/openlp/1194730_2.0/+merge/178437
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/1194730_2.0 into lp:openlp/2.0.
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2012-12-30 19:41:24 +0000
+++ openlp/plugins/bibles/lib/http.py	2013-08-03 20:55:33 +0000
@@ -245,6 +245,8 @@
             return None
         Receiver.send_message(u'openlp_process_events')
         div = soup.find('div', 'result-text-style-normal')
+        if not div:
+            return None
         self._clean_soup(div)
         span_list = div.findAll('span', 'text')
         log.debug('Span list: %s', span_list)


Follow ups