Tweak some more the builtins display.

ionelmc · ionelmc · commit d0e879ee9ec2 · 2020-10-22T16:07:32.000+03:00
diff --git a/src/hunter/actions.py b/src/hunter/actions.py
@@ -453,7 +453,7 @@ def __call__(self, event):
         if event.kind == 'call':
             if event.builtin:
                 self.output(
-                    '{}{}{}{KIND}{:9} {}{COLOR} >{NORMAL} {}.{}: {}{RESET}\n',
+                    '{}{}{}{KIND}{:9} {}{COLOR} >{BUILTIN} {}.{}: {}{RESET}\n',
                     pid_prefix,
                     thread_prefix,
                     filename_prefix,
@@ -462,7 +462,7 @@ def __call__(self, event):
                     event.module,
                     event.function,
                     self.try_source(event).strip(),
-                    COLOR=self.event_colors['builtin'],
+                    COLOR=self.event_colors.get(event.kind),
                 )
             else:
                 code = event.code
@@ -484,29 +484,42 @@ def __call__(self, event):
                     COLOR=self.event_colors.get(event.kind),
                 )
         elif event.kind == 'exception':
-            self.output(
-                '{}{}{}{KIND}{:9} {}{COLOR} !{NORMAL} {}: {RESET}{}\n',
-                pid_prefix,
-                thread_prefix,
-                filename_prefix,
-                event.kind,
-                '   ' * (len(stack) - 1),
-                event.function,
-                self.try_str(event.arg) if event.detached else self.try_repr(event.arg),
-                COLOR=self.event_colors.get(event.kind),
-            )
+            if event.builtin:
+                self.output(
+                    '{}{}{}{KIND}{:9} {}{COLOR} ! {BUILTIN}{}.{}{RESET}\n',
+                    pid_prefix,
+                    thread_prefix,
+                    filename_prefix,
+                    event.kind,
+                    '   ' * (len(stack) - 1),
+                    event.module,
+                    event.function,
+                    COLOR=self.event_colors.get(event.kind),
+                )
+            else:
+                self.output(
+                    '{}{}{}{KIND}{:9} {}{COLOR} !{NORMAL} {}: {RESET}{}\n',
+                    pid_prefix,
+                    thread_prefix,
+                    filename_prefix,
+                    event.kind,
+                    '   ' * (len(stack) - 1),
+                    event.function,
+                    self.try_str(event.arg) if event.detached else self.try_repr(event.arg),
+                    COLOR=self.event_colors.get(event.kind),
+                )
         elif event.kind == 'return':
             if event.builtin:
                 self.output(
-                    '{}{}{}{KIND}{:9} {}{COLOR} <{NORMAL} {}.{}{RESET}\n',
+                    '{}{}{}{KIND}{:9} {}{COLOR} <{BUILTIN} {}.{}{RESET}\n',
                     pid_prefix,
                     thread_prefix,
                     filename_prefix,
                     event.kind,
                     '   ' * (len(stack) - 1),
                     event.module,
                     event.function,
-                    COLOR=self.event_colors['builtin'],
+                    COLOR=self.event_colors.get(event.kind),
                 )
             else:
                 self.output(
diff --git a/src/hunter/util.py b/src/hunter/util.py
@@ -71,6 +71,7 @@
     'INTERNAL-DETAIL': Fore.WHITE,
     'SOURCE-FAILURE': Style.BRIGHT + Back.YELLOW + Fore.YELLOW,
     'SOURCE-DETAIL': Fore.WHITE,
+    'BUILTIN': Style.NORMAL + Fore.MAGENTA,
 
     'RESET': Style.RESET_ALL,
 }
@@ -83,7 +84,6 @@
         OTHER_COLORS['{}({})'.format(name, key) if name else key] = getattr(group, key)
 CALL_COLORS = {
     'call': Style.BRIGHT + Fore.BLUE,
-    'builtin': Style.BRIGHT + Fore.MAGENTA,
     'line': Fore.RESET,
     'return': Style.BRIGHT + Fore.GREEN,
     'exception': Style.BRIGHT + Fore.RED,
