Revision: 2590
Author: janne.t.harkonen
Date: Wed Mar  3 06:14:26 2010
Log: Use default dos encoding in Windows
http://code.google.com/p/robotframework/source/detail?r=2590

Modified:
 /trunk/src/robot/libraries/OperatingSystem.py

=======================================
--- /trunk/src/robot/libraries/OperatingSystem.py       Wed Mar  3 05:54:30 2010
+++ /trunk/src/robot/libraries/OperatingSystem.py       Wed Mar  3 06:14:26 2010
@@ -216,7 +216,12 @@
     def _decode_from_system(self, string):
         if self._is_jython22():
             return string
-        return unic(string, sys.stdin.encoding, 'ignore')
+        encoding = sys.stdin.encoding
+        if not encoding and os.sep == '\\':
+            encoding = 'cp437'
+        if encoding:
+            return unic(string, encoding)
+        return unic(string)

     def _is_jython22(self):
return sys.platform.startswith('java') and sys.version_info[:2] == (2,2)

Reply via email to