Safer methods Client.read and Model.read with an empty list

Author: florentx

CHANGES.rst

@@ -10,9 +10,13 @@ Changelog
   As an alternative, you can specify the ``protocol`` in the configuration
   file.
 
-* Change the return value of ``Model.browse()`` method with an empty list.
-  It returns an empty ``RecordList`` except if some other argument is
-  provided (e.g. ``all_users = model('res.users').browse([], limit=None)``).
+* Change the return value of ``Model.browse()`` method if search domain is
+  an empty list.  It returns an empty ``RecordList`` except if some other
+  argument is provided (e.g.
+  ``all_users = model('res.users').browse([], limit=None)``).
+
+* Change the return value of ``Client.read()`` and ``Model.read()`` methods
+  if search domain is an empty list:  it returns ``False``.
 
 * Improve error formatting for recent Odoo versions, in interactive mode.
 

erppeek.py

@@ -778,21 +778,20 @@ def execute(self, obj, method, *params, **kwargs):
         ordered = single_id = False
         if method == 'read':
             assert params
-            if issearchdomain(params[0]):
+            if not (params[0] and isinstance(params[0], list)):
+                single_id = True
+                ids = [params[0]] if params[0] else False
+            elif issearchdomain(params[0]):
                 # Combine search+read
                 search_params = self._searchargs(params[:1], kwargs, context)
                 ordered = len(search_params) > 3 and search_params[3]
                 ids = self._execute(obj, 'search', *search_params)
-            elif isinstance(params[0], list):
+            else:
                 ordered = kwargs.pop('order', False) and params[0]
-                ids = set(params[0])
-                ids.discard(False)
+                ids = set(params[0]) - {False}
                 if not ids and ordered:
                     return [False] * len(ordered)
                 ids = sorted(ids)
-            else:
-                single_id = True
-                ids = [params[0]] if params[0] else False
             if not ids:
                 return ids
             if len(params) > 1:

tests/test_client.py

@@ -521,6 +521,8 @@ def test_read_false(self):
                          [False, False])
         self.assertEqual(read('foo.bar', [False], 'first_name', order=True),
                          [False])
+        self.assertEqual(read('foo.bar', [], 'first_name'), False)
+        self.assertEqual(read('foo.bar', [], 'first_name', order=True), False)
 
         self.assertCalls()
 

tests/test_model.py

@@ -282,6 +282,13 @@ def call_read(fields=None):
         )
         self.assertOutput('')
 
+        self.assertEqual(FooBar.read([]), False)
+        self.assertEqual(FooBar.read([], order='name ASC'), False)
+        self.assertEqual(FooBar.read([False]), [])
+        self.assertEqual(FooBar.read([False, False]), [])
+        self.assertCalls()
+        self.assertOutput('')
+
         # No longer supported since 1.6
         FooBar.read(searchterm)
         self.assertCalls(OBJ('foo.bar', 'read', [searchterm], None))