message: Check for callable objects before checking for classes.
diff: @@ -466,6 +466,11 @@ def converted_call(f, owner, options, args, kwargs):
  else:
  effective_args = args
  + elif hasattr(f, '__call__') and hasattr(f, '__class__'):
  + # Callable objects
  + target_entity = f.__call__
  + effective_args = (f,) + args
  +
  elif tf_inspect.isclass(f):
  # Constructors
  # Note: Until we support class constructurs, and enable whole-class
  @@ -474,11 +479,6 @@ def converted_call(f, owner, options, args, kwargs):
  target_entity = f
  effective_args = args
  - elif hasattr(f, '__call__') and hasattr(f, '__class__'):
  - # Callable objects
  - target_entity = f.__call__
  - effective_args = (f,) + args
  -
  else:
  target_entity = f
  raise NotImplementedError('unknown callable type "%s"' % type(f))
  