Merge lp:~tomasgroth/openlp/py35 into lp:openlp/2.2

[Tomas Groth]

Make OpenLP run on Python 3.3-3.5

[Tomas Groth (tomasgroth)]

lp:~tomasgroth/openlp/py35 (revision 2565)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1152/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1075/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1016/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/863/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/460/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/581/
[SUCCESS] https//ci.openlp.io/job/Branch-05b-Test_Coverage/452/

[Tim Bentley (trb143)]

Unable to test but makes sense.

review: Approve

[Raoul Snyman (raoul-snyman)]

Please don't merge this until my approval. I want to look at a few things first.

[Tim Bentley (trb143)]

review: Approve

[Raoul Snyman (raoul-snyman)]

I'm not sure if we should do this with 2.2. I'm more than happy to be convinced otherwise though.

[Tomas Groth (tomasgroth)]

> I'm not sure if we should do this with 2.2. I'm more than happy to be
> convinced otherwise though.
I'll try to convince you then :)
I think this should in particular should go into 2.2. The 2.4 release is 6-8 months away, which means that 2.2 should be able to be used until then. New releases of ubuntu and other distros will include python 3.5, so we need to support it if OpenLP is to run on those distros.
For 2.4 I think we should drop support for python 3.3.

[Raoul Snyman (raoul-snyman)]

OK, I'm convinced.

review: Approve

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2015-09-08 19:13:59 +0000
+++ openlp/plugins/bibles/lib/http.py	2015-10-22 21:08:23 +0000
@@ -27,7 +27,6 @@
 import socket
 import urllib.parse
 import urllib.error
-from html.parser import HTMLParseError
 
 from bs4 import BeautifulSoup, NavigableString, Tag
 
@@ -290,7 +289,7 @@
             page_source = str(page_source, 'cp1251')
         try:
             soup = BeautifulSoup(page_source)
-        except HTMLParseError:
+        except Exception:
             log.error('BeautifulSoup could not parse the Bible page.')
             send_error_message('parse')
             return None
@@ -762,7 +761,7 @@
     try:
         soup = BeautifulSoup(page_source)
         CLEANER_REGEX.sub('', str(soup))
-    except HTMLParseError:
+    except Exception:
         log.exception('BeautifulSoup could not parse the bible page.')
     if not soup:
         send_error_message('parse')
 
=== modified file 'openlp/plugins/songs/lib/songselect.py'
--- openlp/plugins/songs/lib/songselect.py	2015-07-04 21:09:59 +0000
+++ openlp/plugins/songs/lib/songselect.py	2015-10-22 21:08:23 +0000
@@ -23,10 +23,13 @@
 The :mod:`~openlp.plugins.songs.lib.songselect` module contains the SongSelect importer itself.
 """
 import logging
+import sys
 from http.cookiejar import CookieJar
 from urllib.parse import urlencode
 from urllib.request import HTTPCookieProcessor, URLError, build_opener
 from html.parser import HTMLParser
+if sys.version_info > (3, 4):
+    from html import unescape
 
 
 from bs4 import BeautifulSoup, NavigableString
@@ -129,11 +132,18 @@
             if not search_results:
                 break
             for result in search_results:
-                song = {
-                    'title': self.html_parser.unescape(result.find('h3').string),
-                    'authors': [self.html_parser.unescape(author.string) for author in result.find_all('li')],
-                    'link': BASE_URL + result.find('a')['href']
-                }
+                if sys.version_info > (3, 4):
+                    song = {
+                        'title': unescape(result.find('h3').string),
+                        'authors': [unescape(author.string) for author in result.find_all('li')],
+                        'link': BASE_URL + result.find('a')['href']
+                    }
+                else:
+                    song = {
+                        'title': self.html_parser.unescape(result.find('h3').string),
+                        'authors': [self.html_parser.unescape(author.string) for author in result.find_all('li')],
+                        'link': BASE_URL + result.find('a')['href']
+                    }
                 if callback:
                     callback(song)
                 songs.append(song)
@@ -167,7 +177,10 @@
         if callback:
             callback()
         song['copyright'] = '/'.join([li.string for li in song_page.find('ul', 'copyright').find_all('li')])
-        song['copyright'] = self.html_parser.unescape(song['copyright'])
+        if sys.version_info > (3, 4):
+            song['copyright'] = unescape(song['copyright'])
+        else:
+            song['copyright'] = self.html_parser.unescape(song['copyright'])
         song['ccli_number'] = song_page.find('ul', 'info').find('li').string.split(':')[1].strip()
         song['verses'] = []
         verses = lyrics_page.find('section', 'lyrics').find_all('p')
@@ -180,9 +193,15 @@
                 else:
                     verse['lyrics'] += '\n'
             verse['lyrics'] = verse['lyrics'].strip(' \n\r\t')
-            song['verses'].append(self.html_parser.unescape(verse))
+            if sys.version_info > (3, 4):
+                song['verses'].append(unescape(verse))
+            else:
+                song['verses'].append(self.html_parser.unescape(verse))
         for counter, author in enumerate(song['authors']):
-            song['authors'][counter] = self.html_parser.unescape(author)
+            if sys.version_info > (3, 4):
+                song['authors'][counter] = unescape(author)
+            else:
+                song['authors'][counter] = self.html_parser.unescape(author)
         return song
 
     def save_song(self, song):