Merge pull request #198 from Delgan/fix_196

Prevent exponential number of calls while accessing "closed" / "isatty" (#196)
tartley · Nov 3, 2018 · 90f2fac · 90f2fac
2 parents c11da6f + 510bb8b
commit 90f2fac
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/colorama/ansitowin32.py b/colorama/ansitowin32.py
@@ -45,12 +45,20 @@ def isatty(self):
         if 'PYCHARM_HOSTED' in os.environ:
             if stream is not None and (stream is sys.__stdout__ or stream is sys.__stderr__):
                 return True
-        return (hasattr(stream, 'isatty') and stream.isatty())
+        try:
+            stream_isatty = stream.isatty
+        except AttributeError:
+            return False
+        else:
+            return stream_isatty()
 
     @property
     def closed(self):
         stream = self.__wrapped
-        return not hasattr(stream, 'closed') or stream.closed
+        try:
+            return stream.closed
+        except AttributeError:
+            return True
 
 
 class AnsiToWin32(object):