2 new revisions:
Revision: 39b0d1029618
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 16 04:13:42 2013
Log: process: fix unicode
http://code.google.com/p/robotframework/source/detail?r=39b0d1029618
Revision: 59ff9be73121
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 16 04:13:53 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=59ff9be73121
==============================================================================
Revision: 39b0d1029618
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 16 04:13:42 2013
Log: process: fix unicode
http://code.google.com/p/robotframework/source/detail?r=39b0d1029618
Modified:
/atest/testdata/standard_libraries/process/test_process_library.txt
/src/robot/libraries/Process.py
=======================================
--- /atest/testdata/standard_libraries/process/test_process_library.txt Thu
May 16 00:57:05 2013
+++ /atest/testdata/standard_libraries/process/test_process_library.txt Thu
May 16 04:13:42 2013
@@ -62,7 +62,8 @@
${result}= Run Process python -c "import os; print
os.environ;" shell=True
Should Match Regexp ${result.stdout} (.*)(?i)@{curenv}[0](.*)
Should Not Match Regexp ${result.stdout} (.*)(?i)specialvar(.*)
- ${result}= Run Process python -c "import os; print
os.environ;" shell=True env:specia£var=spessu
+ ${special_var}= Evaluate 'specialvar' if sys.version_info < (2,6)
else 'specia£var' sys
+ ${result}= Run Process python -c "import os; print
os.environ;" shell=True env:${special_var}=spessu
Should Match Regexp ${result.stdout} (.*)(?i)@{curenv}[0](.*)
Should Match Regexp ${result.stdout} (.*)(?i)specia(.*)var(.*)
${result}= Run Process python -c "import os; print
os.environ;" shell=True env=${setenv}
=======================================
--- /src/robot/libraries/Process.py Thu May 16 00:57:05 2013
+++ /src/robot/libraries/Process.py Thu May 16 04:13:42 2013
@@ -485,7 +485,9 @@
if key == "env":
self.env = dict()
for k,v in val.iteritems():
- self.env[k.encode('utf-8')] = v.encode('utf-8')
+ k = k.encode('utf-8')
+ v = v.encode('utf-8')
+ self.env[k] = v
elif "env:" == key[:4]:
new_env[key[4:]] = val.encode('utf-8')
else:
==============================================================================
Revision: 59ff9be73121
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 16 04:13:53 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=59ff9be73121
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
