dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed Issue 1434:admin page error listing with maximum recursion depth exceeded

Browse Source
This commit is contained in:
mdipierro
2013-04-07 19:55:52 -05:00
parent e8d97f5706
commit 1344c50f85
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
gluon/html.py
+4 -3
View File
@@ -586,7 +586,7 @@ class XML(XmlComponent):
return self.text return self.text
def __str__(self): def __str__(self):
return self.xml() return self.text
def __add__(self, other): def __add__(self, other):
return '%s%s' % (self, other) return '%s%s' % (self, other)
@@ -600,8 +600,9 @@ class XML(XmlComponent):
def __hash__(self): def __hash__(self):
return hash(str(self)) return hash(str(self))
def __getattr__(self, name): # why was this here? Break unpickling in sessions
return getattr(str(self), name) # def __getattr__(self, name):
# return getattr(str(self), name)
def __getitem__(self, i): def __getitem__(self, i):
return str(self)[i] return str(self)[i]