remove explicit UTF-8 calls [fix: Error on load public url #2]

saidul85 · Mar 8, 2014 · f2aa3f3 · f2aa3f3
1 parent 522ac22
commit f2aa3f3
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.gdrive" version="0.2.7.20140307" name="gdrive" provider-name="dmdsoftware">
+<addon id="plugin.video.gdrive" version="0.2.7.20140308" name="gdrive" provider-name="dmdsoftware">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
     </requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+- remove explicit UTF-8 calls [Error on load public url #2]
+- add remote-debugger code
+- cleanup of logging statements
 - don't login or provide authorization token for public videos (unless denied access)
 - add thumbnail previews
 Version 0.2.7

diff --git a/default.py b/default.py
@@ -27,9 +27,9 @@
 
 def log(msg, err=False):
     if err:
-        xbmc.log(addon.getAddonInfo('name') + ': ' + msg.encode('utf-8'), xbmc.LOGERROR)
+        xbmc.log(addon.getAddonInfo('name') + ': ' + msg, xbmc.LOGERROR)
     else:
-        xbmc.log(addon.getAddonInfo('name') + ': ' + msg.encode('utf-8'), xbmc.LOGDEBUG)
+        xbmc.log(addon.getAddonInfo('name') + ': ' + msg, xbmc.LOGDEBUG)
 
 def parse_query(query):
     queries = cgi.parse_qs(query)
@@ -42,7 +42,7 @@ def parse_query(query):
 def addVideo(url, infolabels, img='', fanart='', total_items=0,
                    cm=[], cm_replace=False):
     infolabels = decode_dict(infolabels)
-    log('adding video: %s - %s' % (infolabels['title'].decode('utf-8','ignore'), url))
+    log('adding video: %s - %s' % (infolabels['title'], url))
     listitem = xbmcgui.ListItem(infolabels['title'], iconImage=img,
                                 thumbnailImage=img)
     listitem.setInfo('video', infolabels)

diff --git a/icon.png b/icon.png
diff --git a/icon.xcf b/icon.xcf
diff --git a/resources/__init__.py b/resources/__init__.py
diff --git a/resources/__init__.pyc b/resources/__init__.pyc
diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml
diff --git a/resources/lib/__init__.py b/resources/lib/__init__.py
diff --git a/resources/lib/__init__.pyc b/resources/lib/__init__.pyc
diff --git a/resources/lib/gdrive.py b/resources/lib/gdrive.py
@@ -28,9 +28,9 @@
 
 def log(msg, err=False):
     if err:
-        xbmc.log(addon.getAddonInfo('name') + ': ' + msg.encode('utf-8'), xbmc.LOGERROR)
+        xbmc.log(addon.getAddonInfo('name') + ': ' + msg, xbmc.LOGERROR)
     else:
-        xbmc.log(addon.getAddonInfo('name') + ': ' + msg.encode('utf-8'), xbmc.LOGDEBUG)
+        xbmc.log(addon.getAddonInfo('name') + ': ' + msg, xbmc.LOGDEBUG)
 
 class gdrive:
 

diff --git a/resources/lib/gdrive.pyc b/resources/lib/gdrive.pyc
diff --git a/resources/settings.xml b/resources/settings.xml