fixed issues with Rows.__or__, thanks Anthony
This commit is contained in:
@@ -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
|
||||
|
||||
+3
-3
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user