pass through return values in decorators

shaunc · Jul 7, 2011 · 75cd2c2 · 75cd2c2
1 parent 640e052
commit 75cd2c2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/freshen/stepregistry.py b/freshen/stepregistry.py
@@ -92,7 +92,7 @@ def run(self, *args, **kwargs):
  self.func(*args, **kwargs)
 
  def __call__(self, *args, **kwargs):
- self.func(*args, **kwargs)
+ return self.func(*args, **kwargs)
 
  def match(self, match):
  if not hasattr( self, 're_spec' ):
@@ -122,7 +122,7 @@ def run(self, scenario):
  self.func(scenario)
 
  def __call__(self, *args, **kwargs):
- self.func(*args, **kwargs)
+ return self.func(*args, **kwargs)
 
 class TransformImpl(WithReprMixin):
 
@@ -247,6 +247,8 @@ def add_named_transform( self, named_transform ):
  named_transform.apply_to_step( step )
 
  def _apply_transforms(self, iarg, arg, step):
+ # deal with missing "optional" arguments (coded in "?" block in re)
+ if arg is None: return None
  nt_iter = izip( step.named_transforms, step.named_transform_positions )
 
  for transform, ipos in nt_iter: