From 981e3dca65b3b76e2e258b5cab2b2bddf8e4705e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 Jul 2011 20:57:10 +0200 Subject: [PATCH] Fix reduce_domain to keep empty clause review50005 --- trytond/tests/test_tools.py | 2 ++ trytond/tools/misc.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/trytond/tests/test_tools.py b/trytond/tests/test_tools.py index 60005efc3b..c6bb78c8be 100644 --- a/trytond/tests/test_tools.py +++ b/trytond/tests/test_tools.py @@ -118,6 +118,8 @@ class ToolsTestCase(unittest.TestCase): ['OR', clause, ['AND', clause, ['OR', clause, clause]]]), (['OR', [clause]], ['OR', ['AND', clause]]), ([], []), + (['OR', clause, []], ['OR', clause, []]), + (['AND', clause, []], ['AND', clause, []]), ) for i, j in tests: self.assertEqual(reduce_domain(i), j, diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py index fc41cbdcf7..c20e264a95 100644 --- a/trytond/tools/misc.py +++ b/trytond/tools/misc.py @@ -446,4 +446,6 @@ def reduce_domain(domain): result.extend(sub_domain[1:]) else: result.append(sub_domain) + else: + result.append(arg) return result