Author: laukpe
Date: Sun Sep 21 15:04:32 2008
New Revision: 779
Modified:
trunk/proto/remote/Remote.py
trunk/proto/remote/python/examplelibrary.py
trunk/proto/remote/python/robotremoteserver.py
Log:
decided to convert None to empty string anyway
Modified: trunk/proto/remote/Remote.py
==============================================================================
--- trunk/proto/remote/Remote.py (original)
+++ trunk/proto/remote/Remote.py Sun Sep 21 15:04:32 2008
@@ -38,6 +38,11 @@
if isinstance(arg, (tuple, list)):
return [ self._handle_argument(item) for item in arg ]
if isinstance(arg, dict):
- return dict([ (str(key), self._handle_argument(value))
+ return dict([ (self._str(key), self._handle_argument(value))
for key, value in arg.items() ])
- return str(arg)
+ return self._str(arg)
+
+ def _str(self, item):
+ if item is None:
+ return ''
+ return str(item)
Modified: trunk/proto/remote/python/examplelibrary.py
==============================================================================
--- trunk/proto/remote/python/examplelibrary.py (original)
+++ trunk/proto/remote/python/examplelibrary.py Sun Sep 21 15:04:32 2008
@@ -82,7 +82,7 @@
self._should_be_equal(arg, False)
def none_as_argument(self, arg):
- self._should_be_equal(arg, 'None')
+ self._should_be_equal(arg, '')
def object_as_argument(self, arg):
self._should_be_equal(arg, '<MyObject>')
@@ -120,7 +120,7 @@
def nested_dictionary_as_argument(self, arg):
exp = { '1': {'True': False},
- '2': {'A': {'1': 'None'}, 'B': {'<MyObject>': {}}} }
+ '2': {'A': {'1': ''}, 'B': {'<MyObject>': {}}} }
self._should_be_equal(arg, exp)
def _should_be_equal(self, arg, exp):
@@ -228,6 +228,6 @@
if __name__ == '__main__':
import sys
- from RobotRemoteServer import RobotRemoteServer
+ from robotremoteserver import RobotRemoteServer
RobotRemoteServer(RemoteTestLibrary(), *sys.argv[1:])
Modified: trunk/proto/remote/python/robotremoteserver.py
==============================================================================
--- trunk/proto/remote/python/robotremoteserver.py (original)
+++ trunk/proto/remote/python/robotremoteserver.py Sun Sep 21 15:04:32 2008
@@ -80,9 +80,14 @@
if isinstance(ret, (tuple, list)):
return [ self._handle_return_value(item) for item in ret ]
if isinstance(ret, dict):
- return dict([ (str(key), self._handle_return_value(value))
+ return dict([ (self._str(key),
self._handle_return_value(value))
for key, value in ret.items() ])
- return str(ret)
+ return self._str(ret)
+
+ def _str(self, item):
+ if item is None:
+ return ''
+ return str(item)
def _redirect_stdout(self):
# TODO: What about stderr?
