xlwings-utils 0.0.7.post1__tar.gz → 0.0.7.post3__tar.gz

{xlwings_utils-0.0.7.post1 → xlwings_utils-0.0.7.post3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 0.0.7.post1
+Version: 0.0.7.post3
 Summary: xlwings_utils
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/xlwings_utils

{xlwings_utils-0.0.7.post1 → xlwings_utils-0.0.7.post3}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [
     { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
 ]
 description = "xlwings_utils"
-version = "0.0.7.post1"
+version = "0.0.7.post3"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [

{xlwings_utils-0.0.7.post1 → xlwings_utils-0.0.7.post3}/xlwings_utils/xlwings_utils.py

@@ -13,7 +13,7 @@ from pathlib import Path
 import os
 import sys
 
-_org_stdout = sys.stdout
+_buffer=[]
 
 dbx = None
 Pythonista = sys.platform == "ios"
@@ -420,64 +420,48 @@ def captured_stdout_as_value(clear=True):
     return [[line] for line in captured_stdout_as_str(clear).splitlines()]
 
 
-class handle_capture_stdout:
-    def __init__(self):
-        pass
 
-    def isatty(self):
-        return False
 
-    def write(self, data):
-        if _do_capture:
-            _buffer.append(data)
-        if _do_print:
-            _org_stdout.write(data)
-
-    def flush(self):
-        if _do_print:
-            _org_stdout.flush()
-        if _do_capture:
-            _buffer.append("\n")
-
-
-def reset():
-    global _buffer
-    global _do_print
-    global _do_capture
-    _buffer = []
-    _do_print = True
-    _do_capture = False
-
-sys.stdout = handle_capture_stdout()
-reset()
-
-def capture_stdout(do_print=True, do_capture=True, clear=True):
-    global _do_print
-    global _do_capture
+class capture_stdout:
     """
-    start capture stdout
+    specifies how to capture stdout
 
     Parameters
     ----------
-    do_print : bool
-        if True (default), the output is (also) printed out as normal
+    include_print : bool
+        if True (default), the output is also printed out as normal
 
         if False, no output is printed
 
-    do_capture : bool
-        if True (default), the output is (also) captured to a buffer
-
-        if False, no output is captured
+    Note
+    ----
+    Use this function as a context manager, like ::
 
-    clear : bool
-        if True (default), the capture buffer is emptied
+        with capture_stdout():
+            ...
     """
-    if not (do_print or do_capture):
-        raise ValueError("at least one of do_print and do_capture should be True")
-    clear_captured_stdout(clear)
-    _do_print = do_print
-    _do_capture = do_capture
 
+    def __init__(self, include_print: bool = True, clear=True):
+        self.stdout = sys.stdout
+        self.include_print = include_print
+        if clear:
+            _buffer.clear()
+
+    def __enter__(self):
+        sys.stdout = self
+
+    def __exit__(self, exc_type, exc_value, tb):
+        sys.stdout = self.stdout
+
+    def write(self, data):
+        _buffer.append(data)
+        if self.include_print:
+            self.stdout.write(data)
+
+    def flush(self):
+        if self.include_print:
+            self.stdout.flush()
+        _buffer.append("\n")
 
 if __name__ == "__main__":
     ...

{xlwings_utils-0.0.7.post1 → xlwings_utils-0.0.7.post3}/xlwings_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xlwings_utils
-Version: 0.0.7.post1
+Version: 0.0.7.post3
 Summary: xlwings_utils
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/xlwings_utils