openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/testing into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix numbered book BG bible downloads Bug #609354
-- 
https://code.launchpad.net/~meths/openlp/testing/+merge/30855
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/testing into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2010-06-19 11:53:20 +0000
+++ openlp/plugins/bibles/lib/http.py	2010-07-24 14:04:46 +0000
@@ -24,10 +24,11 @@
 ###############################################################################
 
 import logging
-import urllib2
 import os
+import re
 import sqlite3
-import re
+import urllib
+import urllib2
 
 from BeautifulSoup import BeautifulSoup, Tag, NavigableString
 
@@ -197,12 +198,14 @@
             Chapter number
         """
         log.debug(u'get_bible_chapter %s, %s, %s', version, bookname, chapter)
-        urlstring = u'http://www.biblegateway.com/passage/?search=%s+%s' \
-            u'&version=%s' % (bookname, chapter, version)
-        log.debug(u'BibleGateway url = %s' % urlstring)
+        url_params = urllib.urlencode(
+            {u'search': u'%s %s' % (bookname, chapter),
+            u'version': u'%s' % version})
         # Let's get the page, and then open it in BeautifulSoup, so as to
         # attempt to make "easy" work of bad HTML.
-        page = urllib2.urlopen(urlstring)
+        page = urllib2.urlopen(
+            u'http://www.biblegateway.com/passage/?%s' % url_params)
+        log.debug(u'BibleGateway url = %s' % page.geturl())
         Receiver.send_message(u'openlp_process_events')
         soup = BeautifulSoup(page)
         Receiver.send_message(u'openlp_process_events')