From 62811d660fbbc005da735eb1649c2437c9719e92 Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Wed, 27 Aug 2014 10:43:18 +0200
Subject: [PATCH] Implemented a workaround for bug1251437

Fixes: https://launchpad.net/bugs/1251437
---
 openlp/core/utils/__init__.py                 | 19 +++++++++++++++++++
 openlp/plugins/bibles/lib/http.py             |  1 -
 .../openlp_plugins/bibles/test_lib_http.py    | 13 +++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 9b024eb84..255384b2d 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -109,6 +109,22 @@ class VersionThread(QtCore.QThread):
             Registry().execute('openlp_version_check', '%s' % version)
 
 
+class HTTPRedirectHandlerFixed(urllib.request.HTTPRedirectHandler):
+    """
+    Special HTTPRedirectHandler used to work around http://bugs.python.org/issue22248
+    (Redirecting to urls with special chars)
+    """
+    def redirect_request(self, req, fp, code, msg, headers, newurl):
+        # Test if the newurl can be decoded to ascii
+        try:
+            test_url = newurl.encode('latin1').decode('ascii')
+            fixed_url = newurl
+        except Exception:
+            # The url could not be decoded to ascii, so we do some url encoding
+            fixed_url = urllib.parse.quote(newurl.encode('latin1').decode('utf-8', 'replace'), safe='/:')
+        return super(HTTPRedirectHandlerFixed, self).redirect_request(req, fp, code, msg, headers, fixed_url)
+
+
 def get_application_version():
     """
     Returns the application version of the running instance of OpenLP::
@@ -341,6 +357,9 @@ def get_web_page(url, header=None, update_openlp=False):
     # http://docs.python.org/library/urllib2.html
     if not url:
         return None
+    # This is needed to work around http://bugs.python.org/issue22248 and https://bugs.launchpad.net/openlp/+bug/1251437
+    opener = urllib.request.build_opener(HTTPRedirectHandlerFixed())
+    urllib.request.install_opener(opener)
     req = urllib.request.Request(url)
     if not header or header[0].lower() != 'user-agent':
         user_agent = _get_user_agent()
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 6b26dfabe..9f60ecc33 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -32,7 +32,6 @@ The :mod:`http` module enables OpenLP to retrieve scripture from bible websites.
 import logging
 import re
 import socket
-import urllib.request
 import urllib.parse
 import urllib.error
 from html.parser import HTMLParseError
diff --git a/tests/interfaces/openlp_plugins/bibles/test_lib_http.py b/tests/interfaces/openlp_plugins/bibles/test_lib_http.py
index 517732e4d..9d72677ce 100644
--- a/tests/interfaces/openlp_plugins/bibles/test_lib_http.py
+++ b/tests/interfaces/openlp_plugins/bibles/test_lib_http.py
@@ -59,6 +59,19 @@ class TestBibleHTTP(TestCase):
         # THEN: We should get back a valid service item
         assert len(books) == 66, 'The bible should not have had any books added or removed'
 
+    def bible_gateway_extract_books_support_redirect_test(self):
+        """
+        Test the Bible Gateway retrieval of book list for DN1933 bible with redirect (bug 1251437)
+        """
+        # GIVEN: A new Bible Gateway extraction class
+        handler = BGExtract()
+
+        # WHEN: The Books list is called
+        books = handler.get_books_from_http('DN1933')
+
+        # THEN: We should get back a valid service item
+        assert len(books) == 66, 'This bible should have 66 books'
+
     def bible_gateway_extract_verse_test(self):
         """
         Test the Bible Gateway retrieval of verse list for NIV bible John 3