From e94921c002dc3b7e4fd87cc66e7deb457b41f1f2 Mon Sep 17 00:00:00 2001 From: Massimo Date: Tue, 22 Oct 2013 17:03:54 -0500 Subject: [PATCH] fixed issues with Rows.__or__, thanks Anthony --- VERSION | 2 +- gluon/dal.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 461d2b6a..9abd9699 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.10.21.21.29.21 +Version 2.7.4-stable+timestamp.2013.10.22.17.02.48 diff --git a/gluon/dal.py b/gluon/dal.py index abca02e9..ca623c38 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -10412,9 +10412,9 @@ class Rows(object): def __or__(self,other): if self.colnames!=other.colnames: raise Exception('Cannot | incompatible Rows objects') - records = self.records - records += [record for record in other.records \ - if not record in records] + records = [record for record in other.records + if not record in self.records] + records = self.records + records return Rows(self.db,records,self.colnames) def __nonzero__(self):