Head r964 and book spelling

openlp/plugins/bibles/lib/http.py

@@ -24,10 +24,11 @@
 ###############################################################################
 
 import logging
-import urllib2
 import os
-import sqlite3
 import re
+import sqlite3
+import urllib
+import urllib2
 
 from BeautifulSoup import BeautifulSoup, NavigableString
 
@@ -195,10 +196,12 @@ class BGExtract(BibleCommon):
             Chapter number
         """
         log.debug(u'get_bible_chapter %s, %s, %s', version, bookname, chapter)
-        urlstring = u'http://www.biblegateway.com/passage/?search=%s+%s' \
+        url_params = urllib.urlencode(
-            u'&version=%s' % (bookname, chapter, version)
+            {u'search': u'%s %s' % (bookname, chapter),
-        log.debug(u'BibleGateway url = %s' % urlstring)
+            u'version': u'%s' % version})
-        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')