From 1344c50f85b12f1f3949facca59abbe3ba91d58c Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 7 Apr 2013 19:55:52 -0500 Subject: [PATCH] fixed Issue 1434:admin page error listing with maximum recursion depth exceeded --- VERSION | 2 +- gluon/html.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 1241d66f..36b39e30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.04.07.19.44.10 +Version 2.4.6-stable+timestamp.2013.04.07.19.55.04 diff --git a/gluon/html.py b/gluon/html.py index 3d406af8..97a322b7 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -586,7 +586,7 @@ class XML(XmlComponent): return self.text def __str__(self): - return self.xml() + return self.text def __add__(self, other): return '%s%s' % (self, other) @@ -600,8 +600,9 @@ class XML(XmlComponent): def __hash__(self): return hash(str(self)) - def __getattr__(self, name): - return getattr(str(self), name) +# why was this here? Break unpickling in sessions +# def __getattr__(self, name): +# return getattr(str(self), name) def __getitem__(self, i): return str(self)[i]