feat: allow anything with __name__ when making namespaces

Author: kalekundert

parametrize_from_file/namespace.py

@@ -38,7 +38,8 @@ class Namespace(Mapping):
             >>> with_math.eval('math.sqrt(4)')
             2.0
 
-        ...modules:
+        ...anything with a `__name__` attribute, e.g. modules, classes, and 
+        functions:
             
             >>> with_math = Namespace(math)
             >>> with_math.eval('math.sqrt(4)')
@@ -396,10 +397,8 @@ def star(module):
     }
 
 def _update_namespace(ns_dict, *args, **kwargs):
-    from inspect import ismodule
-
     for arg in args:
-        if ismodule(arg):
+        if hasattr(arg, '__name__'):
             ns_dict[arg.__name__] = arg
         elif isinstance(arg, str):
             exec(arg, ns_dict)

tests/test_namespace.py

@@ -3,6 +3,12 @@
 from parametrize_from_file import Namespace, star, error
 from operator import itemgetter
 
+class Named1:
+    pass
+
+def named_2():
+    pass
+
 class IgnoreMissing:
 
     def __init__(self, items):
@@ -22,6 +28,7 @@ def __eq__(self, other):
             ([{'a': 1}], {}, {'a': 1}),
             (['a = 1'], {}, {'a': 1}),
             ([sys], {}, {'sys': sys}),
+            ([Named1], {}, {'Named1': Named1}),
             ([], {'a': 1}, {'a': 1}),
 
             # Two names:
@@ -35,16 +42,25 @@ def __eq__(self, other):
             (['a = 1', {'b': 2}], {}, {'a': 1, 'b': 2}),
             (['a = 1', 'b = 2'], {}, {'a': 1, 'b': 2}),
             (['a = 1', sys], {}, {'a': 1, 'sys': sys}),
+            (['a = 1', Named1], {}, {'a': 1, 'Named1': Named1}),
             (['a = 1'], {'b': 2}, {'a': 1, 'b': 2}),
 
             ([sys, {'b': 2}], {}, {'sys': sys, 'b': 2}),
             ([sys, 'b = 2'], {}, {'sys': sys, 'b': 2}),
             ([sys, os], {}, {'sys': sys, 'os': os}),
+            ([sys, Named1], {}, {'sys': sys, 'Named1': Named1}),
             ([sys], {'b': 2}, {'sys': sys, 'b': 2}),
 
+            ([Named1, {'b': 2}], {}, {'Named1': Named1, 'b': 2}),
+            ([Named1, 'b = 2'], {}, {'Named1': Named1, 'b': 2}),
+            ([Named1, sys], {}, {'Named1': Named1, 'sys': sys}),
+            ([Named1, named_2], {}, {'Named1': Named1, 'named_2': named_2}),
+            ([Named1], {'b': 2}, {'Named1': Named1, 'b': 2}),
+
             ([{'b': 2}], {'a': 1}, {'a': 1, 'b': 2}),
             (['b = 2'], {'a': 1}, {'a': 1, 'b': 2}),
             ([sys], {'a': 1}, {'a': 1, 'sys': sys}),
+            ([Named1], {'a': 1}, {'a': 1, 'Named1': Named1}),
             ([], {'a': 1, 'b': 2}, {'a': 1, 'b': 2}),
 
             # Order matters: