Fixes for python 2.5.

diff --git a/www/webapp/__init__.py b/www/webapp/__init__.py
index 659f76980442d6195611e7dbf31351defef30879..6b5c35cddc56657a5a7c811784f66db258841cdf 100644 (file)
--- a/www/webapp/__init__.py
+++ b/www/webapp/__init__.py
@@ -1,13 +1,16 @@
 #/usr/bin/python
 
 import os.path
+import simplejson
+
+simplejson._default_decoder = simplejson.JSONDecoder(encoding="latin-1")
 
 import tornado.locale
 import tornado.options
 import tornado.web
 
-from .handlers import *
-from .ui_modules import *
+from handlers import *
+from ui_modules import *
 
 BASEDIR = os.path.join(os.path.dirname(__file__), "..")
 

diff --git a/www/webapp/banners.py b/www/webapp/banners.py
index 2c7343cd4c8dc0f010391bf4412386cdcb9b86a9..0ad56e5af3923dbc7b3483f2d8f69397af4c21c7 100644 (file)
--- a/www/webapp/banners.py
+++ b/www/webapp/banners.py
@@ -3,7 +3,7 @@
 import random
 import simplejson
 
-from helpers import Item
+from helpers import Item, _stringify
 
 class Banners(object):
        def __init__(self, filename=None):
@@ -18,7 +18,7 @@ class Banners(object):
                f.close()
                
                for item in simplejson.loads(data):
-                       self.items.append(Item(**item))
+                       self.items.append(Item(**_stringify(item)))
 
        def get(self):
                return random.choice(self.items)

diff --git a/www/webapp/helpers.py b/www/webapp/helpers.py
index dfa1d7ee619c2f2c47088219a9515fab310cbb09..21ed2b9a6e708570a8def2892d816ed3c0eec04c 100644 (file)
--- a/www/webapp/helpers.py
+++ b/www/webapp/helpers.py
@@ -23,3 +23,10 @@ def size(s):
                idx += 1
        
        return "%.2f %s" % (s, suffixes[idx])
+
+def _stringify(d):
+       ret = {}
+       for key in d.keys():
+               ret[str(key)] = d[key]
+       return ret
+

diff --git a/www/webapp/news.py b/www/webapp/news.py
index 139e255e45b9be75d7e724cc2f641976d2f6d3a3..d99d2ed88a8663438b99258c584b4587e3434042 100644 (file)
--- a/www/webapp/news.py
+++ b/www/webapp/news.py
@@ -2,7 +2,7 @@
 
 import simplejson
 
-from .helpers import Item
+from .helpers import Item, _stringify
 
 class News(object):
        def __init__(self, filename=None):
@@ -20,7 +20,7 @@ class News(object):
 
                json = simplejson.loads(data)
                for key in sorted(json.keys()):
-                       self.items.append(NewsItem(**json[key]))
+                       self.items.append(NewsItem(**_stringify(json[key])))
 
        def get(self, limit=None):
                ret = self.items[:]

diff --git a/www/webapp/releases.py b/www/webapp/releases.py
index a59273033dcee115244b05beb2890d8f45c44559..81d04722583a13a97b7b85e53b79410e9776165d 100644 (file)
--- a/www/webapp/releases.py
+++ b/www/webapp/releases.py
@@ -2,7 +2,7 @@
 
 import simplejson
 
-from helpers import Item
+from helpers import Item, _stringify
 
 class ReleaseItem(Item):
        options = {
@@ -105,7 +105,7 @@ class Releases(object):
                f.close()
                
                for item in simplejson.loads(data):
-                       self.items.append(ReleaseItem(**item))
+                       self.items.append(ReleaseItem(**_stringify(item)))
 
        @property
        def all(self):