2 new revisions:
Revision: e7eac115399f
Branch: default
Author: Pekka Klärck
Date: Wed Sep 19 08:20:47 2012
Log: tidy/utils.Application: use utils.isatty instead of own isatty
impleme...
http://code.google.com/p/robotframework/source/detail?r=e7eac115399f
Revision: 38a73736a010
Branch: default
Author: Pekka Klärck
Date: Wed Sep 19 08:28:11 2012
Log: fixed unit test on ipy after adding special utils.isatty
implementatio...
http://code.google.com/p/robotframework/source/detail?r=38a73736a010
==============================================================================
Revision: e7eac115399f
Branch: default
Author: Pekka Klärck
Date: Wed Sep 19 08:20:47 2012
Log: tidy/utils.Application: use utils.isatty instead of own isatty
implementation
http://code.google.com/p/robotframework/source/detail?r=e7eac115399f
Modified:
/src/robot/tidy.py
/src/robot/utils/application.py
=======================================
--- /src/robot/tidy.py Mon Sep 17 07:27:56 2012
+++ /src/robot/tidy.py Wed Sep 19 08:20:47 2012
@@ -97,7 +97,7 @@
from robot.errors import DataError
from robot.parsing import ResourceFile, TestDataDirectory, TestCaseFile
-from robot.utils import Application, encode_output
+from robot.utils import Application, encode_output, isatty
class Tidy(object):
@@ -169,7 +169,7 @@
self._print(tidy.file(inputs[0]))
def _print(self, msg):
- if self._isatty(sys.stdout):
+ if isatty(sys.stdout):
msg = encode_output(msg)
else:
if os.sep == '\\' and 'b' not in sys.stdout.mode:
=======================================
--- /src/robot/utils/application.py Mon Sep 17 07:27:56 2012
+++ /src/robot/utils/application.py Wed Sep 19 08:20:47 2012
@@ -101,12 +101,6 @@
self._exit(rc)
return rc
- def _isatty(self, stream):
- # http://ironpython.codeplex.com/workitem/33123
- if sys.platform == 'cli':
- return False
- return hasattr(stream, 'isatty') and stream.isatty()
-
def _exit(self, rc):
sys.exit(rc)
==============================================================================
Revision: 38a73736a010
Branch: default
Author: Pekka Klärck
Date: Wed Sep 19 08:28:11 2012
Log: fixed unit test on ipy after adding special utils.isatty
implementation for it
http://code.google.com/p/robotframework/source/detail?r=38a73736a010
Modified:
/utest/output/test_monitor.py
=======================================
--- /utest/output/test_monitor.py Tue Sep 4 13:23:31 2012
+++ /utest/output/test_monitor.py Wed Sep 19 08:28:11 2012
@@ -1,8 +1,15 @@
import unittest
+import sys
from robot.utils.asserts import assert_equals
from robot.output.monitor import CommandLineMonitor
+# Overwrite IronPython's special utils.isatty with version using
stream.isatty.
+# Otherwise our StreamStub.isatty would not really work.
+if sys.platform == 'cli':
+ from robot import utils
+ utils.isatty = lambda stream: hasattr(stream, 'isatty') and
stream.isatty()
+
class TestKeywordNotification(unittest.TestCase):
