From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Jan 2010 19:40:21 +0000 (+0100)
Subject: Python 2.5 fixes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf31ca666d76f5190697a7b1e2f19462544311e7;p=ipfire.org.git

Python 2.5 fixes.
---

diff --git a/www/webapp/menu.py b/www/webapp/menu.py
index b32c3e3f..d998fd37 100644
--- a/www/webapp/menu.py
+++ b/www/webapp/menu.py
@@ -2,7 +2,7 @@
 
 import simplejson
 
-from helpers import Item
+from helpers import Item, _stringify
 
 class Menu(object):
 	def __init__(self, filename=None):
@@ -17,7 +17,7 @@ class Menu(object):
 		f.close()
 		
 		for item in simplejson.loads(data):
-			self.items.append(MenuItem(**item))
+			self.items.append(MenuItem(**_stringify(item)))
 
 
 class MenuItem(Item):
@@ -29,7 +29,7 @@ class MenuItem(Item):
 		if self.args.has_key("subs"):
 			self.args["items"] = []
 			for sub in self.args["subs"]:
-				self.args["items"].append(MenuItem(**sub))
+				self.args["items"].append(MenuItem(**_stringify(sub)))
 			del self.args["subs"]