The branch, gotham has been updated
       via  af4e09fa806efd5f3d2d387356aa9464d8c47c42 (commit)
      from  041499da9b041da08f5ac99a355eaa794cf2bd4d (commit)

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

commit af4e09fa806efd5f3d2d387356aa9464d8c47c42
Author: Martijn Kaijser <[email protected]>
Date:   Fri Jun 6 22:19:04 2014 +0200

    [weather.wunderground] 3.0.6

diff --git a/weather.wunderground/addon.xml b/weather.wunderground/addon.xml
index fbb07ce..21493f6 100644
--- a/weather.wunderground/addon.xml
+++ b/weather.wunderground/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.wunderground" name="Weather Underground" version="3.0.5" 
provider-name="Team XBMC">
+<addon id="weather.wunderground" name="Weather Underground" version="3.0.6" 
provider-name="Team XBMC">
        <requires>
                <import addon="xbmc.python" version="2.12.0"/>
                <import addon="script.module.simplejson" version="3.3.0"/>
diff --git a/weather.wunderground/changelog.txt 
b/weather.wunderground/changelog.txt
index 77eeb34..0aab563 100644
--- a/weather.wunderground/changelog.txt
+++ b/weather.wunderground/changelog.txt
@@ -1,3 +1,6 @@
+v3.0.6
+- fix crash due to api change
+
 v3.0.5
 - fix crash due to api change
 
diff --git a/weather.wunderground/default.py b/weather.wunderground/default.py
index 2b77214..8d3fabb 100644
--- a/weather.wunderground/default.py
+++ b/weather.wunderground/default.py
@@ -55,6 +55,10 @@ MAXDAYS          = 6
 
 socket.setdefaulttimeout(10)
 
+def mk_int(s):
+    s = s.strip()
+    return int(s) if s else 0
+
 def recode(alert): # workaround: wunderground provides a corrupt alerts message
     try:
         alert = alert.encode("latin-1").rstrip('&nbsp)').decode("utf-8")
@@ -279,7 +283,7 @@ def properties(data,loc,locid):
     else:
         set_property('Today.Sunrise'                   , 
data['moon_phase']['sunrise']['hour'] + ':' + 
data['moon_phase']['sunrise']['minute'])
         set_property('Today.Sunset'                    , 
data['moon_phase']['sunset']['hour'] + ':' + 
data['moon_phase']['sunset']['minute'])
-    set_property('Today.moonphase'                     , 
MOONPHASE(int(data['moon_phase']['ageOfMoon']), 
int(data['moon_phase']['percentIlluminated'])))
+    set_property('Today.moonphase'                 , 
MOONPHASE(mk_int(data['moon_phase']['ageOfMoon']), 
mk_int(data['moon_phase']['percentIlluminated'])))
     if 'F' in TEMPUNIT:
         set_property('Today.AvgHighTemperature'        , 
data['almanac']['temp_high']['normal']['F'] + TEMPUNIT)
         set_property('Today.AvgLowTemperature'         , 
data['almanac']['temp_low']['normal']['F'] + TEMPUNIT)

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

Summary of changes:
 weather.wunderground/addon.xml     |    2 +-
 weather.wunderground/changelog.txt |    3 +++
 weather.wunderground/default.py    |    6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their 
applications. Written by three acclaimed leaders in the field, 
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to