Revision: 2594
Author: janne.t.harkonen
Date: Thu Mar 4 01:33:46 2010
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=2594
Modified:
/trunk/src/robot/libraries/OperatingSystem.py
=======================================
--- /trunk/src/robot/libraries/OperatingSystem.py Wed Mar 3 06:24:44 2010
+++ /trunk/src/robot/libraries/OperatingSystem.py Thu Mar 4 01:33:46 2010
@@ -218,11 +218,11 @@
def _decode_from_system(self, string):
if self._is_jython22():
return string
- encoding = sys.stdin.encoding
- if not encoding and os.sep == '\\':
- encoding = 'cp437'
+ encoding = sys.stdout.encoding or sys.stdin.encoding
if encoding:
return unic(string, encoding)
+ if os.sep == '\\':
+ return unic(string, 'cp437') # Use default DOS encoding
return unic(string)
def _is_jython22(self):
