Revision: 2553 Author: janne.t.harkonen Date: Fri Feb 26 03:16:21 2010 Log: replaced unsafe usages of str() with utils.unic() http://code.google.com/p/robotframework/source/detail?r=2553
Modified: /trunk/src/robot/libraries/Remote.py /trunk/src/robot/running/keywords.py ======================================= --- /trunk/src/robot/libraries/Remote.py Thu Apr 16 02:35:30 2009 +++ /trunk/src/robot/libraries/Remote.py Fri Feb 26 03:16:21 2010 @@ -1,18 +1,17 @@ # Copyright 2008-2009 Nokia Siemens Networks Oyj -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import xmlrpclib import socket import time @@ -22,11 +21,11 @@ except ImportError: ExpatError = None # Support for Jython 2.2(.x) +from robot import utils from robot.errors import RemoteError class Remote: - ROBOT_LIBRARY_SCOPE = 'TEST SUITE' def __init__(self, uri='http://localhost:8270'): @@ -76,7 +75,7 @@ def _str(self, item): if item is None: return '' - return str(item) + return utils.unic(item) class RemoteResult: ======================================= --- /trunk/src/robot/running/keywords.py Thu Feb 25 01:30:42 2010 +++ /trunk/src/robot/running/keywords.py Fri Feb 26 03:16:21 2010 @@ -324,7 +324,7 @@ try: runner.get_result() except ExecutionFailed, err: - errors.append(str(err)) + errors.append(utils.unic(err)) self.status = 'FAIL' recorder.replay(output) self.endtime = utils.get_timestamp()
