handling default=None

AcademySoftwareFoundation · Mar 4, 2021 · c12a8b9 · c12a8b9
1 parent 489807e
commit c12a8b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/rez/rex_bindings.py b/src/rez/rex_bindings.py
@@ -263,6 +263,10 @@ def commands():
     elif isinstance(obj, VersionBinding):
         range2 = VersionRange(str(obj))
 
+    # eg 'if intersects(ephemerals.get('foo.cli'), ...)'
+    elif obj is None:
+        range2 = VersionRange(obj)
+
     else:
         raise RuntimeError(
             "Invalid type %s passed as first arg to 'intersects'" % type(obj)

diff --git a/src/rez/tests/test_rex.py b/src/rez/tests/test_rex.py
@@ -483,6 +483,10 @@ def test_intersects_ephemerals(self):
         bar_on = intersects(ephemerals.get("foo.bar", "foo.bar-0"), "1")
         self.assertFalse(bar_on)  # workaround, see PR nerdvegas/rez#1030
 
+        ephemerals = EphemeralsBinding([])
+        bar_on = intersects(ephemerals.get("foo.bar", default=None), "0")
+        self.assertFalse(bar_on)
+
         # ephemerals.get_range
         ephemerals = EphemeralsBinding([Requirement(".foo.bar-1")])
         bar_on = intersects(ephemerals.get_range("foo.bar", "0"), "1")
@@ -504,6 +508,10 @@ def test_intersects_ephemerals(self):
         foo = intersects(ephemerals.get_range("foo", "==1.2.3"), "1.4")
         self.assertTrue(foo)
 
+        ephemerals = EphemeralsBinding([])
+        bar_on = intersects(ephemerals.get_range("foo.bar", default=None), "0")
+        self.assertFalse(bar_on)
+
 
 if __name__ == '__main__':
     unittest.main()