Merge branch 'fix-rex-env-contains' of https://github.com/davidlatwe/rez

 into davidlatwe-fix-rex-env-contains

src/rez/rex.py

@@ -1140,7 +1140,10 @@ def __repr__(self):
                                self.value())
 
     def __nonzero__(self):
-        return bool(self.value())
+        try:
+            return bool(self.value())
+        except RexUndefinedVariableError:
+            return False
 
     __bool__ = __nonzero__  # py3 compat
 

src/rez/tests/test_rex.py

@@ -360,6 +360,32 @@ def _rex2():
                        'BAH': 'omg',
                        'FOO': os.pathsep.join(['omg', '${BAH}', 'like']) + ', $SHE said, omg'})
 
+    def test_10(self):
+        """Test env __contains__ and __bool__"""
+
+        def _test(func, env, expected):
+            ex = self._create_executor(env=env)
+            self.assertEqual(expected, ex.execute_function(func))
+
+        def _rex_1():
+            return {
+                "A": "A" in env.keys(),
+                "B": "B" in env.keys(),
+            }
+
+        def _rex_2():
+            return {
+                "A": "A" in env,
+                "B": "B" in env,
+            }
+
+        def _rex_3():
+            return env.get("B") or "not b"
+
+        _test(_rex_1, env={"A": "foo"}, expected={"A": True, "B": False})
+        _test(_rex_2, env={"A": "foo"}, expected={"A": True, "B": False})
+        _test(_rex_3, env={}, expected="not b")
+
     def test_version_binding(self):
         """Test the Rex binding of the Version class."""
         v = VersionBinding(Version("1.2.3alpha"))

src/rez/utils/data_utils.py

@@ -354,6 +354,9 @@ def __setitem__(self, key, value):
     def __delitem__(self, key):
         del self._data[key]
 
+    def __contains__(self, key):
+        return key in self._data
+
     def __iter__(self):
         return iter(self._data)