peek-python 26.0.4__tar.gz → 26.0.6__tar.gz

{peek_python-26.0.4 → peek_python-26.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: peek-python
-Version: 26.0.4
+Version: 26.0.6
 Summary: peek - like print, but easy
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/peek
@@ -671,15 +671,30 @@ prints something like
 ```
 #4 in x()
     Traceback (most recent call last)
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 6, in <module>
+      File 'x.py', line 6, in <module>
         x()
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 4, in x
+      File 'x.py', line 4, in x
         peek()
 #4 in x()
     Traceback (most recent call last)
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 7, in <module>
+      File 'x.py', line 7, in <module>
         x()
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 4, in x
+      File 'x.py', line 4, in x
+        peek()
+```
+
+If show_traceback is an integer, it depicts the maximum depth of the shown traceback. So:
+```
+def x():
+    peek(show_traceback=1)
+
+x()
+```
+prints something like
+```
+#4 in x()
+    Traceback (most recent call last)
+      File 'x.py', line 4, in x
         peek()
 ```
 The `show_traceback` functionality is also available when peek is used as a decorator or context manager. 
@@ -1212,16 +1227,16 @@ in red, but only if peek.enabled is True (which is the default).
 In order to behave similar to print, `peek` has an extra attribute, `separator_print` (alias: `sepp`). This attribute (default " ") will be used when `peek.printing`.
 When calling `peek.print`, `sep` may be used instead. So
 
-  ```
+```
 peek.sepp = "|"
 peek.print("test")
-  ```
+```
 
 Has the same effect as
 
-```
+  ```
 peek.print("test", sep="|")
-```
+  ```
 
 and
 
@@ -1620,13 +1635,6 @@ It is not possible to use peek:
 * from a frozen application (e.g. packaged with PyInstaller)
 * when the underlying source code has changed during execution
 
-## Changelog
-
-The changelog can be found here:
-
-* https://github.com/salabim/peek/blob/main/changelog.md or
-* https://salabim.org/peek/changelog
-
 
 ## Acknowledgement
 

{peek_python-26.0.4 → peek_python-26.0.6}/README.md

@@ -654,15 +654,30 @@ prints something like
 ```
 #4 in x()
     Traceback (most recent call last)
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 6, in <module>
+      File 'x.py', line 6, in <module>
         x()
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 4, in x
+      File 'x.py', line 4, in x
         peek()
 #4 in x()
     Traceback (most recent call last)
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 7, in <module>
+      File 'x.py', line 7, in <module>
         x()
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 4, in x
+      File 'x.py', line 4, in x
+        peek()
+```
+
+If show_traceback is an integer, it depicts the maximum depth of the shown traceback. So:
+```
+def x():
+    peek(show_traceback=1)
+
+x()
+```
+prints something like
+```
+#4 in x()
+    Traceback (most recent call last)
+      File 'x.py', line 4, in x
         peek()
 ```
 The `show_traceback` functionality is also available when peek is used as a decorator or context manager. 
@@ -1195,16 +1210,16 @@ in red, but only if peek.enabled is True (which is the default).
 In order to behave similar to print, `peek` has an extra attribute, `separator_print` (alias: `sepp`). This attribute (default " ") will be used when `peek.printing`.
 When calling `peek.print`, `sep` may be used instead. So
 
-  ```
+```
 peek.sepp = "|"
 peek.print("test")
-  ```
+```
 
 Has the same effect as
 
-```
+  ```
 peek.print("test", sep="|")
-```
+  ```
 
 and
 
@@ -1603,13 +1618,6 @@ It is not possible to use peek:
 * from a frozen application (e.g. packaged with PyInstaller)
 * when the underlying source code has changed during execution
 
-## Changelog
-
-The changelog can be found here:
-
-* https://github.com/salabim/peek/blob/main/changelog.md or
-* https://salabim.org/peek/changelog
-
 
 ## Acknowledgement
 

{peek_python-26.0.4 → peek_python-26.0.6}/peek/peek.py

@@ -34,7 +34,7 @@ import pprint
 import builtins
 import shutil
 
-__version__ = "26.0.4"
+__version__ = "26.0.6"
 
 from pathlib import Path
 
@@ -151,8 +151,6 @@ class _Peek:
 
     ANSI = types.SimpleNamespace(**_color_name_to_ANSI)
 
-    codes = {}
-
     @staticmethod
     def de_alias(name):
         if name == "c":
@@ -170,75 +168,75 @@ class _Peek:
 
         if value is None:
             return
-        match name:
-            case "output":
-                if callable(value):
-                    return
-                if isinstance(value, (str, Path)):
-                    return
-                try:
-                    value.write("")
-                    return
-                except Exception:
-                    pass
-                raise AttributeError("output should be a callable, str, Path or open text file.")
+        if name == "output":
+            if callable(value):
+                return
+            if isinstance(value, (str, Path)):
+                return
+            try:
+                value.write("")
+                return
+            except Exception:
+                pass
+            raise AttributeError("output should be a callable, str, Path or open text file.")
 
-            case "serialize":
-                if callable(value):
-                    return
+        elif name == "serialize":
+            if callable(value):
+                return
 
-            case "color" | "color_value":
-                if isinstance(value, str) and value in _Peek._color_name_to_ANSI:
-                    return
-                if isinstance(value, int) and value in _Peek.id_to_color:
-                    return
+        elif name in ("color", "color_value"):
+            if isinstance(value, str) and value in _Peek._color_name_to_ANSI:
+                return
+            if isinstance(value, int) and value in _Peek.id_to_color:
+                return
 
-            case "delta":
-                if isinstance(value, numbers.Number):
-                    return
+        elif name == "delta":
+            if isinstance(value, numbers.Number):
+                return
 
-            case "line_length":
-                if (isinstance(value, numbers.Number) and value >= 0) or value == "terminal_width":
-                    return
+        elif name == "line_length":
+            if (isinstance(value, numbers.Number) and value >= 0) or value == "terminal_width":
+                return
 
-            case "indent":
-                if isinstance(value, numbers.Number) and value >= 0:
-                    return
+        elif name == "indent":
+            if isinstance(value, numbers.Number) and value >= 0:
+                return
 
-            case "level":
-                if isinstance(value, numbers.Number):
-                    return
+        elif name == "level":
+            if isinstance(value, numbers.Number):
+                return
 
-            case "max_lines":
-                if isinstance(value, numbers.Number) and value > 0:
-                    return
+        elif name == "max_lines":
+            if isinstance(value, numbers.Number) and value > 0:
+                return
 
-            case "wrap_indent":
-                if isinstance(value, str):
+        elif name == "wrap_indent":
+            if isinstance(value, str):
+                return
+            if isinstance(value, numbers.Number):
+                if value > 0:
                     return
-                if isinstance(value, numbers.Number):
-                    if value > 0:
-                        return
 
-            case "format":
-                if isinstance(value, str):
+        elif name == "format":
+            if isinstance(value, str):
+                return
+            try:
+                if all(isinstance(sub_format, str) for sub_format in value):
                     return
-                try:
-                    if all(isinstance(sub_format, str) for sub_format in value):
-                        return
-                except TypeError:
-                    ...
+            except TypeError:
+                ...
 
-            case "filter":
-                if value.strip() == "":
-                    return
-                try:
-                    eval(value, _Peek.name_and_alias_default)
-                    return
-                except Exception:
-                    ...
-            case _:
+        elif name == "filter":
+            if value.strip() == "":
+                return
+            try:
+                eval(value, _Peek.name_and_alias_default)
                 return
+            except Exception:
+                ...
+
+        else:
+            return
 
         raise AttributeError(f"incorrect {name_org}: {repr(value)}{_Peek.in_read_toml_message}")
 
@@ -308,28 +306,15 @@ class _Peek:
                 s = s[1:]
         print(cached + end, end="", file=file)
 
-    def print_without_color(s, end="\n", file=sys.stdout):
-        while s:
-            for ansi, rgb in _Peek._ANSI_to_rgb.items():
-                if s.startswith(ansi):
-                    s = s[len(ansi) :]
-                    break
-            else:
-                print(s[0], end="", file=file)
-                s = s[1:]
-        print("", end=end, file=file)
-
     @staticmethod
     def return_args(args, return_none):
         if return_none:
             return None
-        match len(args):
-            case 0:
-                return None
-            case 1:
-                return args[0]
-            case _:
-                return args
+        if len(args) == 0:
+            return None
+        if len(args) == 1:
+            return args[0]
+        return args
 
     @staticmethod
     def perf_counter():
@@ -362,16 +347,15 @@ class _Peek:
             node = self
             while item not in node._attributes or node._attributes[item] is None:
                 node = node._parent
-            match item:
-                case "delta":
-                    return _Peek.perf_counter() - node._attributes["delta1"] + node._attributes["delta"]
-                case "delta1":
-                    return node._attributes["delta"]
-                case "prefix":
-                    prefix = node._attributes[item]
-                    return str(prefix() if callable(prefix) else prefix)
-                case _:
-                    return node._attributes[item]
+            if item == "delta":
+                return _Peek.perf_counter() - node._attributes["delta1"] + node._attributes["delta"]
+            elif item == "delta1":
+                return node._attributes["delta"]
+            elif item == "prefix":
+                prefix = node._attributes[item]
+                return str(prefix() if callable(prefix) else prefix)
+            else:
+                return node._attributes[item]
         else:
             return self.__getattribute__(item)
 
@@ -462,7 +446,7 @@ class _Peek:
         if this.decorator and this.context_manager:
             raise AttributeError("not allowed to specify both decorator and context_manager")
 
-        Pair = collections.namedtuple("Pair", "left right")
+        Pair = types.SimpleNamespace
 
         call_frame = inspect.currentframe()
         filename0 = call_frame.f_code.co_filename
@@ -545,11 +529,6 @@ class _Peek:
         if call_node is None:
             this._line_number_with_filename_and_parent = ""
         else:
-            # line_number = call_node.lineno
-            # try:
-            #     this_line = code[line_number - 1].strip()
-            # except IndexError:
-            #     this_line = ""
             this._line_number_with_filename_and_parent = f"#{line_number}{filename_name}{parent_function}"
 
         if this.context_manager:
@@ -754,34 +733,34 @@ class _Peek:
                 self.output(s_end, end="")
             else:
                 self.output(s_end)
+        elif self.output in ("stdout", "stderr"):
+            file = sys.stdout if self.output == "stdout" else sys.stderr
+            if Pythonista:
+                _Peek.print_pythonista_color(s_end, end="", file=file)
+            # elif Pyodide:  # not handled via use_color
+            #     _Peek.print_without_color(s, end=self.end, file=file)
+            else:
+                print(s_end, end="", file=file)
+        elif self.output == "logging.debug":
+            logging.debug(s)
+        elif self.output == "logging.info":
+            logging.info(s)
+        elif self.output == "logging.warning":
+            logging.warning(s)
+        elif self.output == "logging.error":
+            logging.error(s)
+        elif self.output == "logging.critical":
+            logging.critical(s)
+        elif self.output in ("", "null"):
+            pass
+        elif isinstance(self.output, str):
+            with open(self.output, "a+", encoding="utf-8") as f:
+                print(s_end, file=f, end="")
+        elif isinstance(self.output, Path):
+            with self.output.open("a+", encoding="utf-8") as f:
+                print(s_end, file=f, end="")
         else:
-            match self.output:
-                case "stdout" | "stderr":
-                    file = sys.stdout if self.output == "stdout" else sys.stderr
-                    if Pythonista:
-                        _Peek.print_pythonista_color(s_end, end="", file=file)
-                    else:
-                        print(s_end, end="", file=file)
-                case "logging.debug":
-                    logging.debug(s)
-                case "logging.info":
-                    logging.info(s)
-                case "logging.warning":
-                    logging.warning(s)
-                case "logging.error":
-                    logging.error(s)
-                case "logging.critical":
-                    logging.critical(s)
-                case "" | "null":
-                    pass
-                case _ if isinstance(self.output, str):
-                    with open(self.output, "a+", encoding="utf-8") as f:
-                        print(s_end, file=f, end="")
-                case _ if isinstance(self.output, Path):
-                    with self.output.open("a+", encoding="utf-8") as f:
-                        print(s_end, file=f, end="")
-                case _:
-                    print(s_end, file=self.output, end="")
+            print(s_end, file=self.output, end="")
 
     def copy_to_clipboard(self, value, confirm=True):
         if Pythonista:
@@ -810,17 +789,30 @@ class _Peek:
 
     def traceback(self):
         if self.show_traceback:
+            if self.show_traceback is True:
+                n = 1_000_000
+            else:
+                n = self.show_traceback
             if isinstance(self.wrap_indent, numbers.Number):
                 wrap_indent = int(self.wrap_indent) * " "
             else:
                 wrap_indent = str(self.wrap_indent)
 
-            result = "\n" + wrap_indent + "Traceback (most recent call last)\n"
-            #  Python 2.7 does not allow entry.filename, entry.line, etc, so we have to index entry
-            return result + "\n".join(
-                wrap_indent + '  File "' + entry[0] + '", line ' + str(entry[1]) + ", in " + entry[2] + "\n" + wrap_indent + "    " + entry[3]
-                for entry in traceback.extract_stack()[:-2]
-            )
+            result = ["", f"{wrap_indent}Traceback (most recent call last)"]
+            entries = []
+            for entry in traceback.extract_stack()[::-1]:
+                filename = Path(entry.filename).name
+                if filename != "peek.py":  # this for pytest,which adds two extra levels
+                    entries.append(entry)
+                    n -= 1
+                    if n == 0:
+                        break
+            for entry in entries[::-1]:
+                filename = Path(entry.filename).name
+                result.append(f"{wrap_indent}  File {filename!r}, line {entry.lineno} in {entry.name}")
+                result.append(f"{wrap_indent}    {entry.line}")
+
+            return "\n".join(result)
         else:
             return ""
 
@@ -891,3 +883,4 @@ reset()
 
 if __name__ != "__main__":
     sys.modules["peek"].__class__ = _PeekModule
+

{peek_python-26.0.4 → peek_python-26.0.6}/peek_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: peek-python
-Version: 26.0.4
+Version: 26.0.6
 Summary: peek - like print, but easy
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/peek
@@ -671,15 +671,30 @@ prints something like
 ```
 #4 in x()
     Traceback (most recent call last)
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 6, in <module>
+      File 'x.py', line 6, in <module>
         x()
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 4, in x
+      File 'x.py', line 4, in x
         peek()
 #4 in x()
     Traceback (most recent call last)
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 7, in <module>
+      File 'x.py', line 7, in <module>
         x()
-      File "c:\Users\Ruud\Dropbox (Personal)\Apps\Python Ruud\peek\x.py", line 4, in x
+      File 'x.py', line 4, in x
+        peek()
+```
+
+If show_traceback is an integer, it depicts the maximum depth of the shown traceback. So:
+```
+def x():
+    peek(show_traceback=1)
+
+x()
+```
+prints something like
+```
+#4 in x()
+    Traceback (most recent call last)
+      File 'x.py', line 4, in x
         peek()
 ```
 The `show_traceback` functionality is also available when peek is used as a decorator or context manager. 
@@ -1212,16 +1227,16 @@ in red, but only if peek.enabled is True (which is the default).
 In order to behave similar to print, `peek` has an extra attribute, `separator_print` (alias: `sepp`). This attribute (default " ") will be used when `peek.printing`.
 When calling `peek.print`, `sep` may be used instead. So
 
-  ```
+```
 peek.sepp = "|"
 peek.print("test")
-  ```
+```
 
 Has the same effect as
 
-```
+  ```
 peek.print("test", sep="|")
-```
+  ```
 
 and
 
@@ -1620,13 +1635,6 @@ It is not possible to use peek:
 * from a frozen application (e.g. packaged with PyInstaller)
 * when the underlying source code has changed during execution
 
-## Changelog
-
-The changelog can be found here:
-
-* https://github.com/salabim/peek/blob/main/changelog.md or
-* https://salabim.org/peek/changelog
-
 
 ## Acknowledgement
 

{peek_python-26.0.4 → peek_python-26.0.6}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [
     { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
 ]
 description = "peek - like print, but easy"
-version = "26.0.4"
+version = "26.0.6"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [

{peek_python-26.0.4 → peek_python-26.0.6}/tests/test_peek.py

@@ -691,6 +691,22 @@ def test_as_decorator(capsys):
     out, err = capsys.readouterr()
     assert out.startswith("called add2(3)\nreturned 5 from add2(3) in ")
 
+    @peek.as_decorator
+    def add2(x):
+        return x + 2
+
+    add2(3)
+    out, err = capsys.readouterr()
+    assert out.startswith("called add2(3)\nreturned 5 from add2(3) in ")
+
+    @peek.as_d
+    def add2(x):
+        return x + 2
+
+    add2(3)
+    out, err = capsys.readouterr()
+    assert out.startswith("called add2(3)\nreturned 5 from add2(3) in ")
+
 
 def test_as_context_manager(capsys):
     with peek.as_context_manager():
@@ -963,22 +979,35 @@ def test_wrap_indent():
 
 def test_traceback(capsys):
     with peek.preserve():
+
+        def x():
+            peek()
+
+        def y():
+            x()
+
         peek.show_traceback = True
-        peek()
+        y()
         out, err = capsys.readouterr()
-        assert out.count("traceback") == 2
-
-        @peek(decorator=True)
-        def p():
-            pass
+        out_lines = out.splitlines()
+        assert out_lines[-2].endswith("in x")
+        assert out_lines[-4].endswith("in y")
+        assert out_lines[-6].endswith("in test_traceback")
 
-        p()
+        peek.show_traceback = 1
+        y()
         out, err = capsys.readouterr()
-        assert out.count("traceback") == 2
-        with peek(context_manager=True):
-            pass
+        out_lines = out.splitlines()
+        assert len(out_lines) == 4
+        assert out_lines[-2].endswith("in x")
+
+        peek.show_traceback = 2
+        y()
         out, err = capsys.readouterr()
-        assert out.count("traceback") == 2
+        out_lines = out.splitlines()
+        assert len(out_lines) == 6
+        assert out_lines[-2].endswith("in x")
+        assert out_lines[-4].endswith("in y")
 
 
 def test_check_output(capsys, tmpdir):
@@ -1353,3 +1382,4 @@ def test_line_length():
 
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])
+