2 new revisions:
Revision: 79b78879fee3
Branch: default
Author: Mika Hänninen <mika.hanni...@gmail.com>
Date: Tue Jun 11 00:05:15 2013
Log: process lib: decoding stuff
http://code.google.com/p/robotframework/source/detail?r=79b78879fee3
Revision: 9a7cc25a236c
Branch: default
Author: Mika Hänninen <mika.hanni...@gmail.com>
Date: Tue Jun 11 00:05:19 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=9a7cc25a236c
==============================================================================
Revision: 79b78879fee3
Branch: default
Author: Mika Hänninen <mika.hanni...@gmail.com>
Date: Tue Jun 11 00:05:15 2013
Log: process lib: decoding stuff
http://code.google.com/p/robotframework/source/detail?r=79b78879fee3
Modified:
/atest/testdata/standard_libraries/process/newlines_and_encoding.txt
/src/robot/libraries/Process.py
=======================================
--- /atest/testdata/standard_libraries/process/newlines_and_encoding.txt
Mon Jun 10 23:07:39 2013
+++ /atest/testdata/standard_libraries/process/newlines_and_encoding.txt
Tue Jun 11 00:05:15 2013
@@ -39,3 +39,4 @@
${is_ok}= Evaluate sys.version_info >= (2,6) and
sys.platform != 'cli' sys
Run Keyword If not ${is_ok} Set Suite Metadata info
precondition_fail
Run Keyword If not ${is_ok} Fail
+ Set Environment Variable LANG en_US.UTF-8
=======================================
--- /src/robot/libraries/Process.py Mon Jun 10 23:17:21 2013
+++ /src/robot/libraries/Process.py Tue Jun 11 00:05:15 2013
@@ -484,13 +484,13 @@
self._stdout = self._construct_stdout()
if self._stdout.endswith('\n'):
self._stdout = self._stdout[:-1]
- return self._stdout
+ return decode_from_system(self._stdout)
def _construct_stdout(self):
if not self.stdout_path:
- return decode_from_system(self._process.stdout.read())
+ return self._process.stdout.read()
with open(self.stdout_path, 'r') as f:
- return decode_from_system(f.read())
+ return f.read()
@property
def stderr(self):
==============================================================================
Revision: 9a7cc25a236c
Branch: default
Author: Mika Hänninen <mika.hanni...@gmail.com>
Date: Tue Jun 11 00:05:19 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=9a7cc25a236c
--
---
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 robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
