Fixes and enhancements

Author: florentx

CHANGES.rst

@@ -2,6 +2,21 @@ Changelog
 ---------
 
 
+2.x (unreleased)
+~~~~~~~~~~~~~~~~
+
+* Default location for the configuration file is the
+  initial working directory.
+
+* Enhanced syntax for method :meth:`RecordList.filtered`.
+  E.g. instead of ``records.filtered(lambda r: r.type == 'active')``
+  it's faster to use ``records.filtered(['type = active'])``.
+
+* Support unary operators even for Python 3.
+
+* Basic sequence operations on :class:`Env` instance.
+
+
 2.1.7 (2019-03-20)
 ~~~~~~~~~~~~~~~~~~
 

odooly.py

@@ -157,7 +157,12 @@ def _convert(node, _consts={'None': None, 'True': True, 'False': False}):
         return {_convert(k): _convert(v)
                 for (k, v) in zip(node.keys, node.values)}
     if isinstance(node, _ast.Name) and node.id in _consts:
-        return _consts[node.id]   # Python <= 3.3
+        return _consts[node.id]             # Python <= 3.3
+    if isinstance(node, _ast.UnaryOp):      # Python >= 3
+        if isinstance(node.op, _ast.USub):
+            return -_convert(node.operand)
+        if isinstance(node.op, _ast.UAdd):
+            return +_convert(node.operand)
     raise ValueError('malformed or disallowed expression')
 
 
@@ -480,10 +485,30 @@ def __new__(cls, client, db_name=()):
             env._models = {}
         return env
 
+    def __contains__(self, name):
+        """Test wether the given model exists."""
+        return name in self._model_names or name in self.models(name)
+
     def __getitem__(self, name):
         """Return the given :class:`Model`."""
         return self._get(name)
 
+    def __iter__(self):
+        """Return an iterator on model names."""
+        return iter(self.models())
+
+    def __len__(self):
+        """Return the size of the model registry."""
+        return len(self.models())
+
+    def __bool__(self):
+        return True
+    __nonzero__ = __bool__
+
+    __eq__ = object.__eq__
+    __ne__ = object.__ne__
+    __hash__ = object.__hash__
+
     def __repr__(self):
         return "<Env '%s@%s'>" % (self.user.login if self.uid else '',
                                   self.db_name)
@@ -627,7 +652,7 @@ def __call__(self, user=None, password=None, context=None):
             return self
         env_key = json.dumps((uid, context), sort_keys=True)
         env = self._cache_get(env_key)
-        if not env:
+        if env is None:
             env = self._configure(uid, user, password, context)
             self._cache_set(env_key, env)
         return env
@@ -1570,9 +1595,15 @@ def mapped(self, func):
         return vals
 
     def filtered(self, func):
-        """Select the records such that ``func(rec)`` is true."""
+        """Select the records such that ``func(rec)`` is true.
+
+        As an alternative ``func`` can be a search domain (list)
+        to search among the records.
+        """
         if callable(func):
             ids = [rec._idnames[0] for rec in self if func(rec)]
+        elif isinstance(func, list):
+            return self & self._model.search([('id', 'in', self.ids)] + func)
         else:
             ids = self[:]._filter(func.split('.')) if func else self._idnames
         return BaseRecord(self._model, ids)
@@ -1922,7 +1953,7 @@ def main(interact=_interact):
 
     (args, domain) = parser.parse_args()
 
-    Client._config_file = os.path.join(os.curdir, args.config or CONF_FILE)
+    Client._config_file = os.path.join(os.getcwd(), args.config or CONF_FILE)
     if args.list_env:
         print('Available settings:  ' + ' '.join(read_config()))
         return

tests/test_model.py

@@ -1197,12 +1197,15 @@ def test_filtered(self):
             [{'id': 42, 'foo_categ_id': False}],
             [{'id': 88, 'foo_categ_id': [33, 'Categ 33']}],
             [{'id': 33, 'flag3': 'OK'}],
+
+            [17],
         ]
 
         ids1 = [42, 13, 17, 42, 112, 4, 7]
         idns1 = [(42, 'qude'), (13, 'trz'), (17, 'dspt'), 42, (112, 'cdz'), False, 4, (7, 'spt')]
         ids1_sorted = sorted(set(ids1) - {False})
         records1 = m.browse(idns1)
+        domain1 = [('id', 'in', records1.ids), ('foo_categ_id.color', 'like', 'Magenta')]
         self.assertEqual(records1.filtered('flag1'),
                          odooly.RecordList(m, [42, 42]))
         self.assertEqual(records1.filtered('foo_categ_id'),
@@ -1221,6 +1224,9 @@ def test_filtered(self):
         self.assertEqual(rec1.filtered('foo_categ_id.flag3'), m.browse([88]))
         self.assertEqual(rec1.filtered(bool), m.browse([88]))
 
+        self.assertEqual(records1.filtered(['foo_categ_id.color like Magenta']),
+                         odooly.RecordList(m, [17]))
+
         self.assertRaises(TypeError, records1.filtered)
 
         self.assertCalls(
@@ -1242,6 +1248,8 @@ def test_filtered(self):
             OBJ('foo.bar', 'read', [42], ['foo_categ_id']),
             OBJ('foo.bar', 'read', [88], ['foo_categ_id']),
             OBJ('foo.categ', 'read', [33], ['flag3']),
+
+            OBJ('foo.bar', 'search', domain1),
         )
 
         records3 = m.browse([])

tests/test_util.py

@@ -47,6 +47,10 @@ def test_searchargs(self):
         self.assertEqual(searchargs((['ham<2'],)), ([('ham', '<', 2)],))
         self.assertEqual(searchargs((['ham<=2'],)), ([('ham', '<=', 2)],))
 
+        # Combine with unary operators
+        self.assertEqual(searchargs((['ham=- 2'],)), ([('ham', '=', -2)],))
+        self.assertEqual(searchargs((['ham<+ 2'],)), ([('ham', '<', 2)],))
+
         # Operators rarely used
         self.assertEqual(searchargs((['status =like Running'],)),
                          ([('status', '=like', 'Running')],))