diff --git a/VERSION b/VERSION index 747c91ff..5d98ccce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-26 17:42:17) dev +Version 2.00.0 (2012-07-26 17:53:32) dev diff --git a/gluon/html.py b/gluon/html.py index 50b61cd0..3776f67b 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -474,6 +474,16 @@ class XmlComponent(object): raise NotImplementedError def __mul__(self,n): return CAT(*[self for i in range(n)]) + def __add__(self,other): + if isinstance(self,CAT): + components = self.components + else: + components = [self] + if isinstance(other,CAT): + components += other.components + else: + components += [other] + return CAT(*components) class XML(XmlComponent): """