From cad89b87ecbee8e5aa5e478c75cf17e9bf84094c Mon Sep 17 00:00:00 2001 From: Olivier Laurent Date: Wed, 21 Jan 2009 14:17:25 +0100 Subject: [PATCH] * fixed bad indentation * _is_operator return value is clearer bzr revid: olt@tinyerp.com-20090121131725-lz105wcnjfcz6b3g --- bin/osv/expression.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/osv/expression.py b/bin/osv/expression.py index 34b222a11d5..83c1bc693ff 100644 --- a/bin/osv/expression.py +++ b/bin/osv/expression.py @@ -34,8 +34,7 @@ class expression(object): """ def _is_operator(self, element): - return (isinstance(element, str) or isinstance(element, unicode)) \ - and element in ['&', '|', '!'] + return isinstance(element, (str, unicode)) and element in ['&', '|', '!'] def _is_leaf(self, element, internal=False): OPS = ('=', '!=', '<>', '<=', '<', '>', '>=', '=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of') @@ -246,7 +245,7 @@ class expression(object): if len_after: if left == 'id': - instr = ','.join(['%s'] * len_after) + instr = ','.join(['%s'] * len_after) else: instr = ','.join([table._columns[left]._symbol_set[0]] * len_after) query = '(%s.%s %s (%s))' % (table._table, left, operator, instr)