From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Jan 2010 11:41:38 +0000 (+0100)
Subject: Fixes for python 2.5.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ccd2ff0d77a59aefafc229a245c78c38750848f;p=ipfire.org.git

Fixes for python 2.5.
---

diff --git a/www/webapp/__init__.py b/www/webapp/__init__.py
index 659f7698..6b5c35cd 100644
--- 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 2c7343cd..0ad56e5a 100644
--- 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 dfa1d7ee..21ed2b9a 100644
--- 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 139e255e..d99d2ed8 100644
--- 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 a5927303..81d04722 100644
--- 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):