Merge pull request #8 from flubshi/feat_python3

Add support for Python 3

addon.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<addon id="plugin.video.waipu.tv" name="Waipu.tv / O2 TV" version="0.2.9" provider-name="flubshi, MiRo">
+<addon id="plugin.video.waipu.tv" name="Waipu.tv / O2 TV" version="0.3.0" provider-name="flubshi, MiRo">
 <requires>
   <import addon="xbmc.python" version="2.25.0"/>
   <import addon="script.module.requests" version="2.12.4"/>
   <import addon="script.module.inputstreamhelper" version="0.3.3"/>
   <import addon="script.module.dateutil" version="2.7.3" />
-  <import addon="script.module.mechanize" version="0.2.6" />
+  <import addon="script.module.mechanize" version="0.4.3" />
 </requires>
 <extension point="xbmc.python.pluginsource" library="main.py">
   <provides>video</provides>
@@ -30,6 +30,7 @@
     <screenshot>resources/screenshots/screenshot-03.jpg</screenshot>
   </assets>
   <news>
+- 0.3.0 Add python3 support
 - 0.2.9 Display and play active recordings
 - 0.2.8 Add O2 Branding and smaller improvements
 - 0.2.7 Improve O2 error handling (encoding of plus) [thx user alexxx]

main.py

@@ -5,9 +5,16 @@
 # License: GPL v.3 https://www.gnu.org/copyleft/gpl.html
 
 import sys
-from urllib import urlencode
-from urlparse import parse_qsl
+try:
+    from urllib import urlencode
+except ImportError:
+    from urllib.parse import urlencode
 from waipu import Waipu
+try:
+    import urlparse
+except ImportError:
+    import urllib.parse as urlparse
+
 import xbmcgui
 import xbmcplugin
 import xbmcaddon
@@ -394,7 +401,7 @@ def play_recording(recordingid):
 
 
 def router(paramstring):
-    params = dict(parse_qsl(paramstring))
+    params = dict(urlparse.parse_qsl(paramstring))
     if params:
         if params['action'] == "play-channel":
             play_channel(params['playouturl'], params['title'], params['logourl'])

waipu.py

@@ -3,7 +3,10 @@
 import base64
 import json
 import mechanize
-import cookielib
+try:
+    import http.cookiejar
+except ImportError:
+    import cookielib
 import xbmc
 
 
@@ -116,8 +119,12 @@ def getLicense(self):
         # Prepare for drm keys
         acc_details = self.getAccountDetails()
         license = {'merchant': 'exaring', 'sessionId': 'default', 'userId': acc_details["userHandle"]}
-        license_str = base64.b64encode(json.dumps(license))
-        return license_str
+        try:
+            license_str = base64.b64encode(json.dumps(license))
+            return license_str
+        except Exception as e:
+            license_str = base64.b64encode(json.dumps(license).encode("utf-8"))
+            return str(license_str, "utf-8")
 
     def getAccountChannels(self):
         jwt_json = self.decodeToken(self.getToken())