Apply hugovk suggestions from code review

Co-authored-by: Hugo van Kemenade <[email protected]>

Author: antocuni

Lib/_colorize.py

@@ -8,18 +8,18 @@
 class ANSIColors:
     BACKGROUND_YELLOW = "\x1b[43m"
     BOLD_BLUE = "\x1b[1;34m"
+    BOLD_CYAN = "\x1b[1;36m"
     BOLD_GREEN = "\x1b[1;32m"
     BOLD_MAGENTA = "\x1b[1;35m"
     BOLD_RED = "\x1b[1;31m"
-    BOLD_TEAL = "\x1b[1;36m"
     BOLD_YELLOW =  "\x1b[1;33m"
     BLACK = "\x1b[30m"
+    CYAN = "\x1b[36m"
     GREEN = "\x1b[32m"
     GREY = "\x1b[90m"
     MAGENTA = "\x1b[35m"
     RED = "\x1b[31m"
     RESET = "\x1b[0m"
-    TEAL = "\x1b[36m"
     YELLOW = "\x1b[33m"
 
 

Lib/_pyrepl/fancycompleter.py

@@ -3,7 +3,7 @@
 #
 #                        All Rights Reserved
 """
-Colorful TAB completion for Python prompt
+Colorful tab completion for Python prompt
 """
 from _pyrepl import readline
 from _colorize import ANSIColors
@@ -18,18 +18,18 @@ class DefaultConfig:
     use_colors = 'auto'
 
     color_by_type = {
-        types.BuiltinMethodType: ANSIColors.BOLD_TEAL,
-        types.MethodType: ANSIColors.BOLD_TEAL,
-        type((42).__add__): ANSIColors.BOLD_TEAL,
-        type(int.__add__): ANSIColors.BOLD_TEAL,
-        type(str.replace): ANSIColors.BOLD_TEAL,
+        types.BuiltinMethodType: ANSIColors.BOLD_CYAN,
+        types.MethodType: ANSIColors.BOLD_CYAN,
+        type((42).__add__): ANSIColors.BOLD_CYAN,
+        type(int.__add__): ANSIColors.BOLD_CYAN,
+        type(str.replace): ANSIColors.BOLD_CYAN,
 
         types.FunctionType: ANSIColors.BOLD_BLUE,
         types.BuiltinFunctionType: ANSIColors.BOLD_BLUE,
 
         type: ANSIColors.BOLD_MAGENTA,
 
-        types.ModuleType: ANSIColors.TEAL,
+        types.ModuleType: ANSIColors.CYAN,
         type(None): ANSIColors.GREY,
         str: ANSIColors.BOLD_GREEN,
         bytes: ANSIColors.BOLD_GREEN,
@@ -48,7 +48,7 @@ def setup(self):
 
 class Completer(rlcompleter.Completer):
     """
-    When doing someting like a.b.<TAB>, display only the attributes of
+    When doing someting like a.b.<tab>, display only the attributes of
     b instead of the full a.b.attr string.
 
     Optionally, display the various completions in different colors
@@ -61,10 +61,10 @@ def __init__(self, namespace=None, Config=DefaultConfig):
 
         # XXX: double check what happens in this case once fancycompleter works
         if False and hasattr(readline, '_setup'):
-            # this is needed to offer pyrepl a better chance to patch
-            # raw_input. Usually, it does at import time, but is we are under
+            # This is needed to offer PyREPL a better chance to patch
+            # raw_input. Usually, it does at import time, but if we are under
             # pytest with output captured, at import time we don't have a
-            # terminal and thus the raw_input hook is not installed
+            # terminal and thus the raw_input hook is not installed.
             readline._setup()
 
         if self.config.use_colors:
@@ -178,7 +178,7 @@ def colorize_matches(self, names, values):
                    for i, name, obj
                    in zip(count(), names, values)]
         # We add a space at the end to prevent the automatic completion of the
-        # common prefix, which is the ANSI ESCAPE sequence.
+        # common prefix, which is the ANSI escape sequence.
         return matches + [' ']
 
     def color_for_obj(self, i, name, value):

Lib/test/test_pyrepl/test_fancycompleter.py

@@ -147,21 +147,21 @@ class A:
             bbb = None
         compl = Completer({'A': A}, ConfigForTest)
         #
-        # in this case, we want to display all attributes which start with
-        # 'a'. MOREOVER, we also include a space to prevent readline to
+        # In this case, we want to display all attributes which start with
+        # 'a'. Moreover, we also include a space to prevent readline to
         # automatically insert the common prefix (which will the the ANSI escape
-        # sequence if we use colors)
+        # sequence if we use colors).
         matches = compl.attr_matches('A.a')
         self.assertEqual(sorted(matches), [' ', 'aaa', 'abc_1', 'abc_2', 'abc_3'])
         #
-        # IF there is an actual common prefix, we return just it, so that readline
+        # If there is an actual common prefix, we return just it, so that readline
         # will insert it into place
         matches = compl.attr_matches('A.ab')
         self.assertEqual(matches, ['A.abc_'])
         #
-        # finally, at the next TAB, we display again all the completions available
-        # for this common prefix. Agai, we insert a spurious space to prevent the
-        # automatic completion of ANSI sequences
+        # Finally, at the next tab, we display again all the completions available
+        # for this common prefix. Again, we insert a spurious space to prevent the
+        # automatic completion of ANSI sequences.
         matches = compl.attr_matches('A.abc_')
         self.assertEqual(sorted(matches), [' ', 'abc_1', 'abc_2', 'abc_3'])