peek-python 1.7.0__tar.gz → 1.8.0.post0__tar.gz

{peek_python-1.7.0 → peek_python-1.8.0.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: peek-python
-Version: 1.7.0
+Version: 1.8.0.post0
 Summary: peek - debugging and benchmarking made easy
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/ycecream
@@ -338,6 +338,7 @@ underscore_numbers      un              False
 enabled                 e               True
 line_length             ll              160
 color                   col             ""
+color_value				colv			""
 level                   l               0
 compact                 c               False
 indent                  i               1
@@ -634,23 +635,33 @@ d=
      'a3': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]}
 ```
 
-## color / col
-This attribute is used to specify the colour of the output.
+## color / col and color_value / colv
+The color attribute is used to specify the colour of the output.
 There's a choice of black, white, red, green, blue, cyan, magenta and yellow.
-To reset the color to 'nothing', use the null string ("").
+To set the color to 'nothing', use the null string ("").
+
+On top of that, color_value may be used to specify the value part of an output item. By specifying color_value as "" (the default), the value part will be displayed with the same color as the rest of the output.
+
+For instance:
 
 ```
-peek.color = "red"
-peek("text in red")
-peek("text in green", color="green")
-peek("plain text", color="")
+x = "x"
+y = "y"
+peek(x, y)
+peek(x, y, color_value="green")
+peek(x, y, color="red")
+peek(x, y, color="red", color_value="green")
 ```
 
-Of course, the colour can be specified in a peek.toml file, to make all peek output in a specified color.
+will result in:
+
+ <img src="https://www.salabim.org/peek/peek_colors.png">
+
+Of course, color and color_value may be specified in a peek.toml file, to make all peek output in a specified color.
 
 > [!NOTE]
 >
-> The color attribute is only applied when using stdout as output.
+> The color and color_value attributes are only applied when using stdout as output.
 
 ## compact / c
 This attribute is used to specify the compact parameter for `pformat` (see the pprint documentation
@@ -1006,22 +1017,6 @@ peek("warning", level=2)
 
 With `peek.show_level()` the program may select which level(s) to show or not.
 
-This is done with a string that specifies which level(s) to show. The string consist of one or more specifiers seperated by a `,`.
-Each specifier may be simple value or a pair of values, separated by a `-` . 
-Valid strings are
-
-* `peek.show_level("0")` ==> 0
-
-* `peek.show_level("0, 1, 2")` ==> 0, 1, 2
-
-* `peek.show_level("1-3")` ==> 1, 2, 3
-
-* `peek.show_level("1-")` ==> 1, 2, 3, 4, ...
-
-* `peek.show_level("-2")` ==> 0, 1, 2
-
-* `peek.show_level("-")` ==> 0, 1, 2, 3, ... (this is the default)
-
 Notice that a level matches if any of the specifiers conditions is met.
 
 `peek.show_level("")`  disables peek output completely.
@@ -1045,16 +1040,63 @@ peek0 = peek.fork(color="red", level=0)
 peek1 = peek.fork(color="yellow", level=1)
 peek2 = peek.fork(color="green", level=2) 
 ```
+
 If level of a peek statement is the null string, peek will never print. That can be useful to disable peek debug info on a per peek instance basis, e.g.:
 
 ```peek_cond = peek.new()
-peek_connd = peek.new()
+peek_cond = peek.new()
 peek_cond(1)
 peek_cond.level = ""
 peek_cond(2)
 ```
+
 This will print only 1.
 
+The most easy form for `peek.show_level` is just a simple value as argument, like `peek.show.level(2)`, which will make only level 2 peeks to work.
+
+`peek.show_level` can have a number (usually 1) of arguments.
+
+Each parameter may be:
+
+* a float value or
+
+- a string with the format *from* - *to*
+  , where both *from* and *to* are optional. If *from* is omitted, -1E30 is assumed. If *to* is omitted, 1E30 is assumed. 
+  Negative values have to be parenthesized.
+
+Examples:
+
+- `peek.show_level (1)` ==> show level 1
+- `peek.show_level (1, -3)` ==> show level 1 and level -3
+- `peek.show_level ("1-2")` ==> show level between 1 and 2
+- `peek.show_level("-")` ==> show all levels
+- `peek.show_level("")` ==> show no levels
+- `peek.show_level("1-")`==> show all levels >= 1
+- `peek.show_level("-10.2")`==> show all levels <=10.2
+- `peek.show_level(1, 2, "5-7", "10-")` ==> show levels 1, 2, between 5 and 7 (inclusive) and >= 10
+- `peek.show_level((-3)-3")` ==> show levels between -3 and 3 (inclusive)
+- `peek.show_level()` ==> returns the current show_level
+
+`show_level` can also be called with a minimum and/or a maximum value, e.g.
+
+  - `peek.show_level(min=1)` ==> show all levels >= 1
+  - `peek.show_level(max=10.2)` ==> show all levels <= 10.2
+  - `peek.show_level(min=1, max=10)` ==> show all levels between 1 and 10 (inclusive)
+
+  Note that min or max cannot be combined with a specifier as above
+
+`show_level` can also be used as a context managerl:
+
+  ```
+  with peek.show_level(1):
+      peek(1, level=1)
+      peek(2, level=2)
+  ```
+
+This will print one line with`1` only.
+
+
+
 # Interpreting the line number information
 
 When `show_line_number` is True or peek() is used without any parameters, the output will contain the line number like:

{peek_python-1.7.0 → peek_python-1.8.0.post0}/README.md

@@ -319,6 +319,7 @@ underscore_numbers      un              False
 enabled                 e               True
 line_length             ll              160
 color                   col             ""
+color_value				colv			""
 level                   l               0
 compact                 c               False
 indent                  i               1
@@ -615,23 +616,33 @@ d=
      'a3': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]}
 ```
 
-## color / col
-This attribute is used to specify the colour of the output.
+## color / col and color_value / colv
+The color attribute is used to specify the colour of the output.
 There's a choice of black, white, red, green, blue, cyan, magenta and yellow.
-To reset the color to 'nothing', use the null string ("").
+To set the color to 'nothing', use the null string ("").
+
+On top of that, color_value may be used to specify the value part of an output item. By specifying color_value as "" (the default), the value part will be displayed with the same color as the rest of the output.
+
+For instance:
 
 ```
-peek.color = "red"
-peek("text in red")
-peek("text in green", color="green")
-peek("plain text", color="")
+x = "x"
+y = "y"
+peek(x, y)
+peek(x, y, color_value="green")
+peek(x, y, color="red")
+peek(x, y, color="red", color_value="green")
 ```
 
-Of course, the colour can be specified in a peek.toml file, to make all peek output in a specified color.
+will result in:
+
+ <img src="https://www.salabim.org/peek/peek_colors.png">
+
+Of course, color and color_value may be specified in a peek.toml file, to make all peek output in a specified color.
 
 > [!NOTE]
 >
-> The color attribute is only applied when using stdout as output.
+> The color and color_value attributes are only applied when using stdout as output.
 
 ## compact / c
 This attribute is used to specify the compact parameter for `pformat` (see the pprint documentation
@@ -987,22 +998,6 @@ peek("warning", level=2)
 
 With `peek.show_level()` the program may select which level(s) to show or not.
 
-This is done with a string that specifies which level(s) to show. The string consist of one or more specifiers seperated by a `,`.
-Each specifier may be simple value or a pair of values, separated by a `-` . 
-Valid strings are
-
-* `peek.show_level("0")` ==> 0
-
-* `peek.show_level("0, 1, 2")` ==> 0, 1, 2
-
-* `peek.show_level("1-3")` ==> 1, 2, 3
-
-* `peek.show_level("1-")` ==> 1, 2, 3, 4, ...
-
-* `peek.show_level("-2")` ==> 0, 1, 2
-
-* `peek.show_level("-")` ==> 0, 1, 2, 3, ... (this is the default)
-
 Notice that a level matches if any of the specifiers conditions is met.
 
 `peek.show_level("")`  disables peek output completely.
@@ -1026,16 +1021,63 @@ peek0 = peek.fork(color="red", level=0)
 peek1 = peek.fork(color="yellow", level=1)
 peek2 = peek.fork(color="green", level=2) 
 ```
+
 If level of a peek statement is the null string, peek will never print. That can be useful to disable peek debug info on a per peek instance basis, e.g.:
 
 ```peek_cond = peek.new()
-peek_connd = peek.new()
+peek_cond = peek.new()
 peek_cond(1)
 peek_cond.level = ""
 peek_cond(2)
 ```
+
 This will print only 1.
 
+The most easy form for `peek.show_level` is just a simple value as argument, like `peek.show.level(2)`, which will make only level 2 peeks to work.
+
+`peek.show_level` can have a number (usually 1) of arguments.
+
+Each parameter may be:
+
+* a float value or
+
+- a string with the format *from* - *to*
+  , where both *from* and *to* are optional. If *from* is omitted, -1E30 is assumed. If *to* is omitted, 1E30 is assumed. 
+  Negative values have to be parenthesized.
+
+Examples:
+
+- `peek.show_level (1)` ==> show level 1
+- `peek.show_level (1, -3)` ==> show level 1 and level -3
+- `peek.show_level ("1-2")` ==> show level between 1 and 2
+- `peek.show_level("-")` ==> show all levels
+- `peek.show_level("")` ==> show no levels
+- `peek.show_level("1-")`==> show all levels >= 1
+- `peek.show_level("-10.2")`==> show all levels <=10.2
+- `peek.show_level(1, 2, "5-7", "10-")` ==> show levels 1, 2, between 5 and 7 (inclusive) and >= 10
+- `peek.show_level((-3)-3")` ==> show levels between -3 and 3 (inclusive)
+- `peek.show_level()` ==> returns the current show_level
+
+`show_level` can also be called with a minimum and/or a maximum value, e.g.
+
+  - `peek.show_level(min=1)` ==> show all levels >= 1
+  - `peek.show_level(max=10.2)` ==> show all levels <= 10.2
+  - `peek.show_level(min=1, max=10)` ==> show all levels between 1 and 10 (inclusive)
+
+  Note that min or max cannot be combined with a specifier as above
+
+`show_level` can also be used as a context managerl:
+
+  ```
+  with peek.show_level(1):
+      peek(1, level=1)
+      peek(2, level=2)
+  ```
+
+This will print one line with`1` only.
+
+
+
 # Interpreting the line number information
 
 When `show_line_number` is True or peek() is used without any parameters, the output will contain the line number like:

{peek_python-1.7.0 → peek_python-1.8.0.post0}/peek/peek.py

@@ -4,7 +4,7 @@
 #  | .__/  \___| \___||_|\_\
 #  |_| like print, but easy.
 
-__version__ = "1.7.0"
+__version__ = "1.8.0"
 
 """
 See https://github.com/salabim/peek for details
@@ -56,30 +56,51 @@ def perf_counter():
 
 
 colors = dict(
-    black=("\033[0;30m", "#000000"),
-    red=("\033[0;31m", "#FF0000"),
-    green=("\033[0;32m", "#00FF00"),
-    yellow=("\033[0;33m", "#A52A2A"),
-    blue=("\033[0;34m", "#0000FF"),
-    magenta=("\033[0;35m", "#800080"),
-    cyan=("\033[0;36m", "#00FFFF"),
-    white=("\033[0;37m", "#D3D3D3"),
+    black="\033[0;30m",
+    red="\033[0;31m",
+    green="\033[0;32m",
+    yellow="\033[0;33m",
+    blue="\033[0;34m",
+    magenta="\033[0;35m",
+    cyan="\033[0;36m",
+    white="\033[0;37m",
 )
+colors[""] = "\033[0m"
+
+
+ansi_to_hexa = {
+    "\033[0;30m": "#000000",
+    "\033[0;31m": "#FF0000",
+    "\033[0;32m": "#00FF00",
+    "\033[0;33m": "#FFFF00",
+    "\033[0;34m": "#0080FF",
+    "\033[0;35m": "#FF00FF",
+    "\033[0;36m": "#00FFFF",
+    "\033[0;37m": "#FFFFFF",
+    "\033[0m": "",
+}
 
 
-def colorname_to_rgb(colorname):
-    return tuple(int(colors[colorname.lower()][1][i : i + 2], 16) / 255 for i in range(1, 7, 2))
+def flatten(x):
+    for item in x:
+        if isinstance(item, str):
+            yield item
+        else:
+            try:
+                yield from flatten(item)
+            except TypeError:
+                yield item
 
 
-def colorname_to_ansi(colorname):
-    return colors[colorname.lower()][0]
+# def colorname_to_rgb(colorname):
+#    return tuple(int(ansito_rgb[colorname.lower()][i : i + 2], 16) / 255 for i in range(1, 7, 2))
 
 
 def check_validity(item, value, message=""):
     if value is None:
         return
 
-    if item == "color":
+    if item in ("color", "color_value"):
         if not value or (isinstance(value, str) and value.lower() in colors):
             return
 
@@ -108,56 +129,83 @@ def check_validity(item, value, message=""):
     raise ValueError(f"incorrect {item}: {value}{message}")
 
 
-def show_level_evaluate(value, message=""):
-    if isinstance(value, str) and value.strip() == "":
-        expression = "False"
-    else:
-        result = []
-        if isinstance(value, numbers.Number):
-            result.append(f"level == {value}")
-        else:
-            if not isinstance(value, str):
-                raise ValueError(f"incorrect show_level spec: {value} {message}")
-
-            if value.strip():
-                elements = value.strip().split(",")
-                for element in elements:
-                    if element == "":
-                        return True
-                    if "-" in element:
-                        part0, part1 = element.split("-", 1)
-                        part0 = part0.strip()
-                        part1 = part1.strip()
-                        if part0 == "":
-                            part0 = "-1e30"
-                        if part1 == "":
-                            part1 = "1e30"
-                        try:
-                            float(part0)
-                            float(part1)
-                        except ValueError as e:
-                            raise ValueError(f"incorrect show_level spec: {element} in {value} {message}") from None
-                        if float(part0) > float(part1):
-                            raise ValueError(f"incorrect show_level spec: {element} in {value} {message}")
-                        result.append(f"{part0} <= level <= {part1}")
-                    else:
-                        try:
-                            float(element)
-                        except ValueError as e:
-                            raise ValueError(f"incorrect show_level spec: {element} in {value} {message}") from None
-                        result.append(f"level == {element}")
+class show_level:
+    def __new__(cls, *values, min=None, max=None, message=""):
+        if len(values) == 0 and min is None and max is None:
+            return _show_level
+        return super().__new__(cls)
+
+    def __init__(self, *values, min=None, max=None, message=""):
+        result = ["False"]
+        if min is not None or max is not None:
+            if values:
+                raise ValueError(f"min or max cannot be combined with other specifiers (={values})")
+            if min is not None and max is not None and min > max:
+                raise ValueError(f"min (={min}) > max (={max})")
+            if min is None:
+                min = ""
+            else:
+                if min < 0:
+                    min = f"({min})"
+            if max is None:
+                max = ""
             else:
-                result.append("True")
+                if max < 0:
+                    max = f"({max})"
+            values = [f"{min}-{max}"]
+
+        valuex = tuple(flatten(values))
+        for element in valuex:
+            if isinstance(element, numbers.Number):
+                result.append(f"level == {element}")
+            elif element is None:
+                ...
+            elif isinstance(element, str):
+                elementx = element.strip().replace("(-", "$$$").replace(")", "").replace("-", "/").replace("$$$", "-")
+                if elementx.lower() == "all":
+                    elementx = "/"
+                if elementx == "":
+                    ...
+                elif "/" in elementx:
+                    part0, part1 = elementx.split("/", 1)
+                    if part0 == "":
+                        part0 = "-1e30"
+                    if part1 == "":
+                        part1 = "1e30"
+                    try:
+                        float(part0)
+                        float(part1)
+                    except ValueError as e:
+                        raise ValueError(f"incorrect show_level spec: {element} in {values} {message}") from None
+                    if float(part0) > float(part1):
+                        raise ValueError(f"incorrect order in show_level spec: {element} in {values} {message}")
+                    result.append(f"{part0} <= level <= {part1}")
+                else:
+                    try:
+                        float(elementx)
+                    except ValueError as e:
+                        raise ValueError(f"incorrect show_level spec: {element} in {values} {message}") from None
+                    result.append(f"level == {element}")
+            else:
+                raise ValueError(f"incorrect show_level spec: {element} in {values} {message}")
 
         expression = f"level != '' and ({' or '.join(result)})"
-    global _show_level
-    global _show_level_expression
-    _show_level = value
-    _show_level_expression = expression
 
+        global _show_level
+        global _show_level_expression
+        self.saved_show_level = _show_level
+        self.saved_show_level_expression = _show_level_expression
+        _show_level = values[0] if len(values) == 1 else values
+        _show_level_expression = expression
+
+    def __enter__(self):
+        ...
 
-def do_show_level(level):
-    return eval(_show_level_expression, dict(level=level))
+    def __exit__(self, exc_type, exc_value, exc_tb):
+        global _show_level
+        global _show_level_expression
+        _show_level = self.saved_show_level
+        _show_level_expression = self.saved_show_level_expression
 
 
 def peek_pformat(obj, width, compact, indent, depth, sort_dicts, underscore_numbers):
@@ -190,7 +238,10 @@ def change_path(new_path):  # used in tests
 
 _fixed_perf_counter = None
 
-show_level_evaluate("-")
+_show_level = "-"
+_show_level_expression = "True"
+
+attrs = set()  # ***
 
 
 def fix_perf_counter(val):  # for tests
@@ -222,6 +273,7 @@ shortcut_to_name = {
     "voff": "values_only_for_fstrings",
     "rn": "return_none",
     "col": "color",
+    "colv": "color_value",
     "l": "level",
     "ell": "enforce_line_length",
     "dl": "delta",
@@ -253,6 +305,7 @@ def set_defaults():
     default.values_only_for_fstrings = False
     default.return_none = False
     default.color = ""
+    default.color_value = ""
     default.level = 0
     default.enforce_line_length = False
     default.one_line_per_pairenforce_line_length = False
@@ -272,7 +325,7 @@ def apply_toml():
                 setattr(default, k, v)
             else:
                 if k == "show_level":
-                    show_level_evaluate(v, " in peek.toml file")
+                    show_level(v, " in peek.toml file")
                 elif k == "delta":
                     setattr(default, "start_time", perf_counter() - v)
                 else:
@@ -337,6 +390,7 @@ class _Peek:
         values_only_for_fstrings=nv,
         return_none=nv,
         color=nv,
+        color_value=nv,
         level=nv,
         enforce_line_length=nv,
         delta=nv,
@@ -392,13 +446,17 @@ class _Peek:
             if value is not None:
                 value = perf_counter() - value
         check_validity(item, value)
+        if item == "show_level":
+            raise NameError("reassigning show_level not allowed")
+
         if item in ["_attributes"]:
             super(_Peek, self).__setattr__(item, value)
         else:
-            if item == "show_level":
-                show_level_evaluate(value)
             self._attributes[item] = value
 
+    def do_show(self):
+        return eval(_show_level_expression, dict(level=self.level)) and self.enabled
+
     def assign(self, shortcuts, source, func):
         for key, value in shortcuts.items():
             if key in shortcut_to_name:
@@ -447,6 +505,7 @@ class _Peek:
         values_only_for_fstrings = kwargs.pop("values_only_for_fstrings", nv)
         return_none = kwargs.pop("return_none", nv)
         color = kwargs.pop("color", nv)
+        color_value = kwargs.pop("color_value", nv)
         level = kwargs.pop("level", nv)
         enforce_line_length = kwargs.pop("enforce_line_length", nv)
         delta = kwargs.pop("delta", nv)
@@ -460,13 +519,19 @@ class _Peek:
         as_str = False if as_str is nv else bool(as_str)
         provided = True if provided is nv else bool(provided)
 
+        this = self.fork()
+        this.assign(kwargs, locals(), func="__call__")
+
+        if len(args) != 0 and not this.do_show():
+            if as_str:
+                return ""
+            else:
+                return return_args(args, this.return_none)
+
         self.is_context_manager = False
 
         Pair = collections.namedtuple("Pair", "left right")
 
-        this = self.fork()
-        this.assign(kwargs, locals(), func="__call__")
-
         if not provided:
             this.enabled = False
 
@@ -525,7 +590,7 @@ class _Peek:
                 this_line_prev = code[line_number - 2].strip()
             else:
                 this_line_prev = ""
-        if len(args) == 0 and (this_line.startswith("@") or this_line_prev.startswith("@")):
+        if this_line.startswith("@") or this_line_prev.startswith("@"):
             if as_str:
                 raise TypeError("as_str may not be True when peek used as decorator")
 
@@ -569,6 +634,9 @@ class _Peek:
 
                 return wrapper
 
+            if not this.do_show():
+                return lambda x: x
+
             return real_decorator
 
         if filename in ("<stdin>", "<string>"):
@@ -584,7 +652,7 @@ class _Peek:
                 line_number=line_number, filename_name=filename_name, parent_function=parent_function
             )
 
-        if len(args) == 0 and (this_line.startswith("with ") or this_line.startswith("with\t")):
+        if this_line.startswith("with ") or this_line.startswith("with\t"):
             if as_str:
                 raise TypeError("as_str may not be True when peek used as context manager")
             if args:
@@ -593,9 +661,11 @@ class _Peek:
             this.is_context_manager = True
             return this
 
-        if not this.enabled and do_show_level(this.level) and not as_str:
-            return return_args(args, this.return_none)
-
+        if not this.do_show():
+            if as_str:
+                return ""
+            else:
+                return return_args(args, this.return_none)
         if args:
             context = this.context()
             pairs = []
@@ -689,7 +759,7 @@ class _Peek:
             out += this.traceback()
 
         if as_str:
-            if this.enabled and do_show_level(this.level):
+            if this.do_show():
                 if this.enforce_line_length:
                     out = "\n".join(line[: this.line_length] for line in out.splitlines())
                 return out + "\n"
@@ -725,6 +795,7 @@ class _Peek:
         values_only_for_fstrings=nv,
         return_none=nv,
         color=nv,
+        color_value=nv,
         level=nv,
         enforce_line_length=nv,
         delta=nv,
@@ -766,6 +837,7 @@ class _Peek:
         values_only_for_fstrings=nv,
         return_none=nv,
         color=nv,
+        color_value=nv,
         level=nv,
         enforce_line_length=nv,
         delta=nv,
@@ -778,7 +850,7 @@ class _Peek:
         return this
 
     def assert_(self, condition):
-        if self.enabled and do_show_level(self.level):
+        if self.do_show():
             assert condition
 
     @contextlib.contextmanager
@@ -822,28 +894,40 @@ class _Peek:
 
         return (self.prefix() if callable(self.prefix) else self.prefix) + context
 
+    def add_color_value(self, s):
+        if self.output != "stdout" or self.color_value == "" or self.as_str:
+            return s
+        return colors[self.color_value] + s + colors[self.color]
+
     def do_output(self, s):
         if self.enforce_line_length:
             s = "\n".join(line[: self.line_length] for line in s.splitlines())
-        if self.enabled and do_show_level(self.level):
+        if self.do_show():
             if callable(self.output):
                 self.output(s)
             elif self.output == "stderr":
                 print(s, file=sys.stderr)
             elif self.output == "stdout":
-                if self.color:
-                    if Pythonista:
-                        console.set_color(*colorname_to_rgb(self.color))
-                    else:
-                        colorama.init()
-                        print(colorname_to_ansi(self.color), end="")
-                print(s, file=sys.stdout)
-                if self.color:
-                    if Pythonista:
-                        console.set_color()
-                    else:
-                        print("\033[0m", end="")
-                        colorama.deinit()
+                s = colors[self.color] + s + colors[""]
+                if Pythonista:
+                    while s:
+                        for ansi, hexa in ansi_to_hexa.items():
+                            if s.startswith(ansi):
+                                if hexa == "":
+                                    console.set_color()
+                                else:
+                                    rgb = tuple(int(hexa[i : i + 2], 16) / 255 for i in range(1, 7, 2))
+                                    console.set_color(*rgb)
+                                s = s[len(ansi) :]
+                                break
+                        else:
+                            print(s[0], end="", file=sys.stdout)
+                            s = s[1:]
+                    print()
+                else:
+                    colorama.init()
+                    print(s, file=sys.stdout)
+                    colorama.deinit()
 
             elif self.output == "logging.debug":
                 logging.debug(s)
@@ -906,7 +990,7 @@ class _Peek:
         if "width" in inspect.signature(self.serialize).parameters:
             kwargs["width"] = width
 
-        return self.serialize(obj, **kwargs).replace("\\n", "\n")
+        return self.add_color_value(self.serialize(obj, **kwargs).replace("\\n", "\n"))
 
 
 codes = {}
@@ -932,3 +1016,4 @@ class PeekModule(types.ModuleType):
 
 if __name__ != "__main__":
     sys.modules["peek"].__class__ = PeekModule
+

{peek_python-1.7.0 → peek_python-1.8.0.post0}/peek_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: peek-python
-Version: 1.7.0
+Version: 1.8.0.post0
 Summary: peek - debugging and benchmarking made easy
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/ycecream
@@ -338,6 +338,7 @@ underscore_numbers      un              False
 enabled                 e               True
 line_length             ll              160
 color                   col             ""
+color_value				colv			""
 level                   l               0
 compact                 c               False
 indent                  i               1
@@ -634,23 +635,33 @@ d=
      'a3': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]}
 ```
 
-## color / col
-This attribute is used to specify the colour of the output.
+## color / col and color_value / colv
+The color attribute is used to specify the colour of the output.
 There's a choice of black, white, red, green, blue, cyan, magenta and yellow.
-To reset the color to 'nothing', use the null string ("").
+To set the color to 'nothing', use the null string ("").
+
+On top of that, color_value may be used to specify the value part of an output item. By specifying color_value as "" (the default), the value part will be displayed with the same color as the rest of the output.
+
+For instance:
 
 ```
-peek.color = "red"
-peek("text in red")
-peek("text in green", color="green")
-peek("plain text", color="")
+x = "x"
+y = "y"
+peek(x, y)
+peek(x, y, color_value="green")
+peek(x, y, color="red")
+peek(x, y, color="red", color_value="green")
 ```
 
-Of course, the colour can be specified in a peek.toml file, to make all peek output in a specified color.
+will result in:
+
+ <img src="https://www.salabim.org/peek/peek_colors.png">
+
+Of course, color and color_value may be specified in a peek.toml file, to make all peek output in a specified color.
 
 > [!NOTE]
 >
-> The color attribute is only applied when using stdout as output.
+> The color and color_value attributes are only applied when using stdout as output.
 
 ## compact / c
 This attribute is used to specify the compact parameter for `pformat` (see the pprint documentation
@@ -1006,22 +1017,6 @@ peek("warning", level=2)
 
 With `peek.show_level()` the program may select which level(s) to show or not.
 
-This is done with a string that specifies which level(s) to show. The string consist of one or more specifiers seperated by a `,`.
-Each specifier may be simple value or a pair of values, separated by a `-` . 
-Valid strings are
-
-* `peek.show_level("0")` ==> 0
-
-* `peek.show_level("0, 1, 2")` ==> 0, 1, 2
-
-* `peek.show_level("1-3")` ==> 1, 2, 3
-
-* `peek.show_level("1-")` ==> 1, 2, 3, 4, ...
-
-* `peek.show_level("-2")` ==> 0, 1, 2
-
-* `peek.show_level("-")` ==> 0, 1, 2, 3, ... (this is the default)
-
 Notice that a level matches if any of the specifiers conditions is met.
 
 `peek.show_level("")`  disables peek output completely.
@@ -1045,16 +1040,63 @@ peek0 = peek.fork(color="red", level=0)
 peek1 = peek.fork(color="yellow", level=1)
 peek2 = peek.fork(color="green", level=2) 
 ```
+
 If level of a peek statement is the null string, peek will never print. That can be useful to disable peek debug info on a per peek instance basis, e.g.:
 
 ```peek_cond = peek.new()
-peek_connd = peek.new()
+peek_cond = peek.new()
 peek_cond(1)
 peek_cond.level = ""
 peek_cond(2)
 ```
+
 This will print only 1.
 
+The most easy form for `peek.show_level` is just a simple value as argument, like `peek.show.level(2)`, which will make only level 2 peeks to work.
+
+`peek.show_level` can have a number (usually 1) of arguments.
+
+Each parameter may be:
+
+* a float value or
+
+- a string with the format *from* - *to*
+  , where both *from* and *to* are optional. If *from* is omitted, -1E30 is assumed. If *to* is omitted, 1E30 is assumed. 
+  Negative values have to be parenthesized.
+
+Examples:
+
+- `peek.show_level (1)` ==> show level 1
+- `peek.show_level (1, -3)` ==> show level 1 and level -3
+- `peek.show_level ("1-2")` ==> show level between 1 and 2
+- `peek.show_level("-")` ==> show all levels
+- `peek.show_level("")` ==> show no levels
+- `peek.show_level("1-")`==> show all levels >= 1
+- `peek.show_level("-10.2")`==> show all levels <=10.2
+- `peek.show_level(1, 2, "5-7", "10-")` ==> show levels 1, 2, between 5 and 7 (inclusive) and >= 10
+- `peek.show_level((-3)-3")` ==> show levels between -3 and 3 (inclusive)
+- `peek.show_level()` ==> returns the current show_level
+
+`show_level` can also be called with a minimum and/or a maximum value, e.g.
+
+  - `peek.show_level(min=1)` ==> show all levels >= 1
+  - `peek.show_level(max=10.2)` ==> show all levels <= 10.2
+  - `peek.show_level(min=1, max=10)` ==> show all levels between 1 and 10 (inclusive)
+
+  Note that min or max cannot be combined with a specifier as above
+
+`show_level` can also be used as a context managerl:
+
+  ```
+  with peek.show_level(1):
+      peek(1, level=1)
+      peek(2, level=2)
+  ```
+
+This will print one line with`1` only.
+
+
+
 # Interpreting the line number information
 
 When `show_line_number` is True or peek() is used without any parameters, the output will contain the line number like:

{peek_python-1.7.0 → peek_python-1.8.0.post0}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
 ]
 description = "peek - debugging and benchmarking made easy"
-version = "1.7.0"
+version = "1.8.0-0"
 readme = "README.md"
 requires-python = ">=3.6"
 dependencies = ["colorama","six","executing","asttokens","tomli"]

{peek_python-1.7.0 → peek_python-1.8.0.post0}/tests/test_peek.py

@@ -336,11 +336,6 @@ lines=
 def test_decorator(capsys):
     peek.fix_perf_counter(0)
 
-    with pytest.raises(TypeError):
-
-        @peek
-        def mul(x, y):
-            return x * y
 
     @peek()
     def div(x, y):
@@ -718,16 +713,18 @@ def test_enabled2(capsys):
 
 def test_level(capsys):
     def peeks(show_level):
-        peek.show_level=show_level
-        peek(0,peek.show_level,level=0)
-        peek(2,peek.show_level,level=2)
-        peek(4,peek.show_level,l=4)
+        peek.show_level(show_level)
+        peek(-1,peek.show_level(),level=-1)
+        peek(0,peek.show_level(),level=0)
+        peek(2,peek.show_level(),level=2)
+        peek(4,peek.show_level(),l=4)
 
-    assert peek.level==0
-    peeks("-")
     peeks("2")
-    peeks("2,3")
-    peeks("-0,2-")
+    peeks((2,3))
+    peeks(("-0","2-"))
+    peeks("(-2)")
+    peeks("(-2)-")
+    peeks("(-2)-(-1)")
     peeks(" 4  ")
     peeks(" -2 ")
     peeks("  ")
@@ -736,38 +733,66 @@ def test_level(capsys):
     peek.level=0
     peek(0)
     peek(0,level="")
+
+    def peeks1(min=None,max=None):
+        peek.show_level(min=min,max=max)
+        peek(-1,peek.show_level(),level=-1)
+        peek(0,peek.show_level(),level=0)
+        peek(2,peek.show_level(),level=2)
+        peek(4,peek.show_level(),l=4)
+
+    peeks1(max=0)
+    peeks1(min=0)
+    peeks1(min=0,max=2)
     
     out, err = capsys.readouterr()
     assert out=="""\
-0, peek.show_level='-'
-2, peek.show_level='-'
-4, peek.show_level='-'
-2, peek.show_level='2'
-2, peek.show_level='2,3'
-0, peek.show_level='-0,2-'
-2, peek.show_level='-0,2-'
-4, peek.show_level='-0,2-'
-4, peek.show_level=' 4  '
-0, peek.show_level=' -2 '
-2, peek.show_level=' -2 '
-0, peek.show_level='-5'
-2, peek.show_level='-5'
-4, peek.show_level='-5'
-0, peek.show_level=0
+2, peek.show_level()='2'
+2, peek.show_level()=(2, 3)
+-1, peek.show_level()=('-0', '2-')
+0, peek.show_level()=('-0', '2-')
+2, peek.show_level()=('-0', '2-')
+4, peek.show_level()=('-0', '2-')
+-1, peek.show_level()='(-2)-'
+0, peek.show_level()='(-2)-'
+2, peek.show_level()='(-2)-'
+4, peek.show_level()='(-2)-'
+-1, peek.show_level()='(-2)-(-1)'
+4, peek.show_level()=' 4  '
+-1, peek.show_level()=' -2 '
+0, peek.show_level()=' -2 '
+2, peek.show_level()=' -2 '
+-1, peek.show_level()='-5'
+0, peek.show_level()='-5'
+2, peek.show_level()='-5'
+4, peek.show_level()='-5'
+0, peek.show_level()=0
 0
+-1, peek.show_level()='-0'
+0, peek.show_level()='-0'
+0, peek.show_level()='0-'
+2, peek.show_level()='0-'
+4, peek.show_level()='0-'
+0, peek.show_level()='0-2'
+2, peek.show_level()='0-2'
 """
     with pytest.raises(ValueError):
         peek.level="a"
     with pytest.raises(ValueError):
-        peek.show_level="a"
-    with pytest.raises(ValueError):
-        peek.show_level=(1,2)
+        peek.show_level("a")
     peek.level=0
     x=peek("a", level=0, as_str=True)
     y=peek("a", enabled=False, as_str=True)
     assert x=="'a'\n"
     assert y== ""
 
+    with pytest.raises(ValueError):
+        peek.show_level(1,min=2)
+    with pytest.raises(ValueError):
+        peek.show_level(1,max=3)
+    with pytest.raises(ValueError):
+        peek.show_level(1,min=2,max=0)
+
 
 def test_multiple_as():
     with pytest.raises(TypeError):