Used isort to sort imports. Also added to the git pre-commit hook.

[python_utils.git] / ansi.py

diff --git a/ansi.py b/ansi.py
index 5fde4af56c9ef18254cd562ca19b10d853597e93..c13e3522fe187efad36ae73de6d174ee76c4b2aa 100755 (executable)
--- a/ansi.py
+++ b/ansi.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-from abc import abstractmethod
 import difflib
 import io
 import logging
 import re
 import sys
+from abc import abstractmethod
 from typing import Any, Callable, Dict, Iterable, Optional, Tuple
 
 from overrides import overrides
@@ -1773,9 +1773,7 @@ def fg(
         green = 0
     if blue is None:
         blue = 0
-    if (
-        is_16color(red) and is_16color(green) and is_16color(blue)
-    ) or force_16color:
+    if (is_16color(red) and is_16color(green) and is_16color(blue)) or force_16color:
         logger.debug("Using 16-color strategy")
         return fg_16color(red, green, blue)
     if (
@@ -1878,9 +1876,7 @@ def bg(
         green = 0
     if blue is None:
         blue = 0
-    if (
-        is_16color(red) and is_16color(green) and is_16color(blue)
-    ) or force_16color:
+    if (is_16color(red) and is_16color(green) and is_16color(blue)) or force_16color:
         logger.debug("Using 16-color strategy")
         return bg_16color(red, green, blue)
     if (
@@ -1894,19 +1890,19 @@ def bg(
 
 class StdoutInterceptor(io.TextIOBase):
     def __init__(self):
-        self.saved_stdout: Optional[io.TextIOBase] = None
+        self.saved_stdout: io.TextIO = None
         self.buf = ''
 
     @abstractmethod
     def write(self, s: str):
         pass
 
-    def __enter__(self) -> None:
+    def __enter__(self):
         self.saved_stdout = sys.stdout
         sys.stdout = self
-        return None
+        return self
 
-    def __exit__(self, *args) -> bool:
+    def __exit__(self, *args) -> Optional[bool]:
         sys.stdout = self.saved_stdout
         print(self.buf)
         return None