Author: laukpe
Date: Mon Sep 22 14:34:21 2008
New Revision: 802
Modified:
trunk/proto/remote/python/robotremoteserver.py
trunk/proto/remote/ruby/robotremoteserver.rb
Log:
minor cleanup
Modified: trunk/proto/remote/python/robotremoteserver.py
==============================================================================
--- trunk/proto/remote/python/robotremoteserver.py (original)
+++ trunk/proto/remote/python/robotremoteserver.py Mon Sep 22 14:34:21 2008
@@ -40,7 +40,7 @@
def run_keyword(self, name, args):
result = {'status':'PASS', 'return':'', 'message':'', 'output':''}
- self._redirect_stdout()
+ self._intercept_stdout()
try:
return_value = self._get_keyword(name)(*args)
except Exception, exp:
@@ -89,7 +89,7 @@
return ''
return str(item)
- def _redirect_stdout(self):
+ def _intercept_stdout(self):
# TODO: What about stderr?
sys.stdout = StringIO()
Modified: trunk/proto/remote/ruby/robotremoteserver.rb
==============================================================================
--- trunk/proto/remote/ruby/robotremoteserver.rb (original)
+++ trunk/proto/remote/ruby/robotremoteserver.rb Mon Sep 22 14:34:21 2008
@@ -16,14 +16,12 @@
end
def get_keyword_names
- # TODO: Would be better to include all methods implemeted by @library
- lib_methods = @library.methods
- obj_methods = Object.new.methods
- lib_methods.reject { |x| obj_methods.index(x) }
+ # Implicit methods can't be used as keywords
+ @library.methods - Object.new.methods
end
def run_keyword(name, args)
- redirect_stdout()
+ intercept_stdout()
result = {'status'=>'PASS', 'return'=>'', 'message'=>'', 'output'=>''}
begin
return_value = @library.send(name, *args)
@@ -67,19 +65,19 @@
ret.each {|item|
new_ret.push(handle_return_value(item))
}
- return new_ret # TODO: Handle internal values
+ return new_ret
elsif ret.class == Hash
new_ret = {}
ret.keys.each {|key|
new_ret[key.to_s] = handle_return_value(ret[key])
}
- return new_ret # TODO: Handle internal values
+ return new_ret
else
return ret.to_s
end
end
- def redirect_stdout
+ def intercept_stdout
$original_stdout = $stdout.dup
@output = ''
$stdout = StringIO.new(@output)
