Commit b6e8c945 authored by Brandon Walts's avatar Brandon Walts
Browse files

Merge branch 'version/2.4' into version/2.5

* version/2.4:
  Add substitution example + one hash, to TestRunnable.py
  Comment not a question
  Allow a single hash in a string without substitution (in python wrapper)
parents 43541abc 4f0d2e21
......@@ -159,6 +159,11 @@ class ParamContainer(object):
The result is a string (like structure)
"""
self.debug_print("subst_all_hashpairs", structure)
# Allow a single literal hash
if structure.count("#") == 1:
return structure
result = []
while True:
(head,_,tmp) = structure.partition('#')
......
......@@ -22,13 +22,17 @@ class TestRunnable(eHive.BaseRunnable):
def param_defaults(self):
return {
'alpha' : 37,
'beta' : 78
'beta' : 78,
'gamma' : '#alpha#',
'delta' : 'one#hash',
}
def fetch_input(self):
self.warning("Fetch the world !")
print("alpha is", self.param_required('alpha'))
print("beta is", self.param_required('beta'))
print("gamma is", self.param_required('gamma'))
print("delta is", self.param_required('delta'))
def run(self):
self.warning("Run the world !")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment