The branch, frodo has been updated
       via  6d672df8fc335ab85c2f6b1e18c134e08c88964e (commit)
       via  cf0074181ff5b9c7808daf2349e0813535f0423f (commit)
      from  96530ce7c40521138196e4c24545e31568c15384 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=6d672df8fc335ab85c2f6b1e18c134e08c88964e


http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=cf0074181ff5b9c7808daf2349e0813535f0423f

commit cf0074181ff5b9c7808daf2349e0813535f0423f
Author: Martijn Kaijser <[email protected]>
Date:   Sun Apr 28 20:22:37 2013 +0200

    [script.module.t0mm0.common] 2.1.1

diff --git a/script.module.t0mm0.common/addon.xml 
b/script.module.t0mm0.common/addon.xml
index c1e8747..6a37ce3 100644
--- a/script.module.t0mm0.common/addon.xml
+++ b/script.module.t0mm0.common/addon.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.module.t0mm0.common" 
             name="t0mm0's common stuff" 
-            version="1.1.0" 
+            version="2.1.1" 
             provider-name="t0mm0">
   <requires>
-    <import addon="xbmc.python" version="2.0" />
+    <import addon="xbmc.python" version="2.1.0" />
   </requires>
   <extension point="xbmc.python.module" library="lib" />
   <extension point="xbmc.addon.metadata">
diff --git a/script.module.t0mm0.common/changelog.txt 
b/script.module.t0mm0.common/changelog.txt
index f540c23..18a4e0f 100644
--- a/script.module.t0mm0.common/changelog.txt
+++ b/script.module.t0mm0.common/changelog.txt
@@ -1,2 +1,7 @@
+[B]Version 2.1.1[/B]
+- Frodo Branch
+- Removed unicoding of text when logging a message
+- Added utf-8 encoding check on build_plugin_url function - corrected issues 
in Frodo
+
 [B]Version 1.0.0[/B]
 - Initial Release.
diff --git a/script.module.t0mm0.common/lib/t0mm0/common/addon.py 
b/script.module.t0mm0.common/lib/t0mm0/common/addon.py
index 7725eca..ff11399 100644
--- a/script.module.t0mm0.common/lib/t0mm0/common/addon.py
+++ b/script.module.t0mm0.common/lib/t0mm0/common/addon.py
@@ -215,7 +215,15 @@ class Addon:
         Retuns:
             A string containing a fully formed ``plugin://`` URL.
         '''
-        return self.url + '?' + urllib.urlencode(queries)
+        out_dict = {}
+        for k, v in queries.iteritems():
+            if isinstance(v, unicode):
+                v = v.encode('utf8')
+            elif isinstance(v, str):
+                # Must be encoded in UTF-8
+                v.decode('utf8')
+            out_dict[k] = v
+        return self.url + '?' + urllib.urlencode(out_dict)
 
 
     def log(self, msg, level=xbmc.LOGNOTICE):
@@ -242,8 +250,8 @@ class Addon:
         Kwargs:
             level (int): The XBMC log level to write at.
         '''
-        msg = unicodedata.normalize('NFKD', unicode(msg)).encode('ascii',
-                                                                 'ignore')
+        #msg = unicodedata.normalize('NFKD', unicode(msg)).encode('ascii',
+        #                                                         'ignore')
         xbmc.log('%s: %s' % (self.get_name(), msg), level)
         
 
@@ -577,7 +585,7 @@ class Addon:
             be added to the list of entries to be displayed in this directory. 
             If a playlist object is passed (see :meth:`get_playlist`) then 
             the item will be added to the playlist instead
-    
+
             item_type (str): The type of item to add (eg. 'music', 'video' or
             'pictures')
         '''
diff --git a/script.module.t0mm0.common/lib/t0mm0/common/net.py 
b/script.module.t0mm0.common/lib/t0mm0/common/net.py
index 71a7124..769881c 100644
--- a/script.module.t0mm0.common/lib/t0mm0/common/net.py
+++ b/script.module.t0mm0.common/lib/t0mm0/common/net.py
@@ -22,6 +22,10 @@ import re
 import StringIO
 import urllib
 import urllib2
+import socket
+
+#Set Global timeout - Useful for slow connections and Putlocker.
+socket.setdefaulttimeout(30)
 
 class HeadRequest(urllib2.Request):
     '''A Request class that sends HEAD requests'''

-----------------------------------------------------------------------

Summary of changes:
 {screensaver.qlock => script.ircchat}/LICENSE.txt  |    0
 script.ircchat/addon.xml                           |   27 +
 script.ircchat/default.py                          |  747 ++++++++++++++++++++
 script.ircchat/fanart.jpg                          |  Bin 0 -> 464461 bytes
 script.ircchat/icon.png                            |  Bin 0 -> 31755 bytes
 script.ircchat/resources/__init__.py               |    1 +
 .../resources/language/English/strings.po          |  191 +++++
 script.ircchat/resources/pyircmod.py               |  503 +++++++++++++
 script.ircchat/resources/settings.xml              |   12 +
 .../resources/skins/Default/720p/FontExample.xml   |   41 ++
 .../skins/Default/720p/script-IrcChat-main.xml     |  646 +++++++++++++++++
 .../resources/skins/Default/colors/defaults.xml    |  147 ++++
 .../skins/Default/media/IrcChat/ChatArrowFO.png    |  Bin 0 -> 3561 bytes
 .../skins/Default/media/IrcChat/ChatArrowNF.png    |  Bin 0 -> 3666 bytes
 .../skins/Default/media/IrcChat/ChatBackground.png |  Bin 0 -> 64106 bytes
 .../skins/Default/media/IrcChat/ChatBalloon2.png   |  Bin 0 -> 5034 bytes
 .../skins/Default/media/IrcChat/ChatBusy.png       |  Bin 0 -> 4522 bytes
 .../skins/Default/media/IrcChat/ChatConnectFO.png  |  Bin 0 -> 9200 bytes
 .../skins/Default/media/IrcChat/ChatConnectNF.png  |  Bin 0 -> 9037 bytes
 .../Default/media/IrcChat/ChatContextBg18.png      |  Bin 0 -> 26198 bytes
 .../skins/Default/media/IrcChat/ChatListbg.png     |  Bin 0 -> 13870 bytes
 .../skins/Default/media/IrcChat/ChatListline.png   |  Bin 0 -> 2878 bytes
 .../skins/Default/media/IrcChat/ChatScrollBg.png   |  Bin 0 -> 2821 bytes
 .../skins/Default/media/IrcChat/ChatSliderNib.png  |  Bin 0 -> 2807 bytes
 .../skins/Default/media/IrcChat/ChatTopBarImg.png  |  Bin 0 -> 10880 bytes
 .../Default/media/IrcChat/ChatTopButtonFO.png      |  Bin 0 -> 3081 bytes
 .../Default/media/IrcChat/ChatTopButtonNF.png      |  Bin 0 -> 3073 bytes
 .../skins/Default/media/IrcChat/ChatWhite35p.png   |  Bin 0 -> 2802 bytes
 script.module.t0mm0.common/addon.xml               |    4 +-
 script.module.t0mm0.common/changelog.txt           |    5 +
 .../lib/t0mm0/common/addon.py                      |   16 +-
 script.module.t0mm0.common/lib/t0mm0/common/net.py |    4 +
 32 files changed, 2338 insertions(+), 6 deletions(-)
 copy {screensaver.qlock => script.ircchat}/LICENSE.txt (100%)
 create mode 100644 script.ircchat/addon.xml
 create mode 100644 script.ircchat/default.py
 create mode 100644 script.ircchat/fanart.jpg
 create mode 100644 script.ircchat/icon.png
 create mode 100644 script.ircchat/resources/__init__.py
 create mode 100644 script.ircchat/resources/language/English/strings.po
 create mode 100644 script.ircchat/resources/pyircmod.py
 create mode 100644 script.ircchat/resources/settings.xml
 create mode 100644 script.ircchat/resources/skins/Default/720p/FontExample.xml
 create mode 100644 
script.ircchat/resources/skins/Default/720p/script-IrcChat-main.xml
 create mode 100644 script.ircchat/resources/skins/Default/colors/defaults.xml
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatArrowFO.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatArrowNF.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatBackground.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatBalloon2.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatBusy.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatConnectFO.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatConnectNF.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatContextBg18.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatListbg.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatListline.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatScrollBg.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatSliderNib.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatTopBarImg.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatTopButtonFO.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatTopButtonNF.png
 create mode 100644 
script.ircchat/resources/skins/Default/media/IrcChat/ChatWhite35p.png


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to