Evaluate injectable functions in get_injecatble

Only when it was registered with autocall=True.

urbansim/sim/simulation.py

@@ -971,11 +971,12 @@ def get_injectable(name):
     Returns
     -------
     injectable
-        Original value or _InjectableFuncWrapper if autocall was True.
+        Original value or evaluated value of an _InjectableFuncWrapper.
 
     """
     if name in _INJECTABLES:
-        return _INJECTABLES[name]
+        i = _INJECTABLES[name]
+        return i() if isinstance(i, _InjectableFuncWrapper) else i
     else:
         raise KeyError('injectable not found: {}'.format(name))
 

urbansim/sim/tests/test_simulation.py

@@ -388,11 +388,17 @@ def inj_func3(func2):
     def inj_func4(func1):
         return func1 / 2
 
+    assert sim._INJECTABLES['answer'] == 42
+    assert sim._INJECTABLES['func1']() == 42 * 2
+    assert sim._INJECTABLES['func2'](4) == 2
+    assert sim._INJECTABLES['func3']() == 2
+    assert sim._INJECTABLES['func4']() == 42
+
     assert sim.get_injectable('answer') == 42
-    assert sim.get_injectable('func1')() == 42 * 2
+    assert sim.get_injectable('func1') == 42 * 2
     assert sim.get_injectable('func2')(4) == 2
-    assert sim.get_injectable('func3')() == 2
-    assert sim.get_injectable('func4')() == 42
+    assert sim.get_injectable('func3') == 2
+    assert sim.get_injectable('func4') == 42
 
     assert set(sim.list_injectables()) == \
         {'answer', 'func1', 'func2', 'func3', 'func4'}
@@ -428,7 +434,7 @@ def test_injectables_cache():
     def inj():
         return x * x
 
-    i = lambda: sim.get_injectable('inj')
+    i = lambda: sim._INJECTABLES['inj']
 
     assert i()() == 4
     x = 3
@@ -452,7 +458,7 @@ def test_injectables_cache_disabled():
     def inj():
         return x * x
 
-    i = lambda: sim.get_injectable('inj')
+    i = lambda: sim._INJECTABLES['inj']
 
     sim.disable_cache()