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]