safer terminal I/O detection

mogproject · Nov 7, 2015 · 4c20cd0 · 4c20cd0
1 parent 2b7c7ba
commit 4c20cd0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/mog_commons/__init__.py b/src/mog_commons/__init__.py
@@ -1 +1 @@
-__version__ = '0.1.20'
+__version__ = '0.1.21'
diff --git a/src/mog_commons/terminal.py b/src/mog_commons/terminal.py
@@ -63,7 +63,7 @@ def __init__(self, term_type=None, encoding=None,
 
     @staticmethod
     def _can_getch_enable(stdin):
-        if stdin.isatty():
+        if hasattr(stdin, 'isatty') and stdin.isatty():
             return os.name == 'nt' or hasattr(stdin, 'fileno')
         return False
 
@@ -125,7 +125,7 @@ def clear(self):
         """
         Clear the terminal screen.
         """
-        if self.stdout.isatty() or self.term_type == 'mintty':
+        if hasattr(self.stdout, 'isatty') and self.stdout.isatty() or self.term_type == 'mintty':
             cmd, shell = {
                 'posix': ('clear', False),
                 'nt': ('cls', True),
@@ -138,7 +138,7 @@ def clear_input_buffer(self):
         """
         Clear the input buffer.
         """
-        if self.stdin.isatty():
+        if hasattr(self.stdin, 'isatty') and self.stdin.isatty():
             if os.name == 'nt':
                 while msvcrt.kbhit():
                     msvcrt.getch()

diff --git a/tests/mog_commons/test_terminal.py b/tests/mog_commons/test_terminal.py
@@ -9,6 +9,11 @@
 
 
 class TestTerminal(TestCase):
+    def test_clear(self):
+        with self.withAssertOutput('', '') as (out, err):
+            # assume this should not raise an error
+            TerminalHandler(stdout=out, stderr=err).clear()
+
     def test_getch_from_file(self):
         with open(os.path.join('tests', 'resources', 'test_terminal_input.txt')) as f:
             t = TerminalHandler(stdin=f)