Merge branch 'stable' into fishy_gdb

Author: peace-maker

CHANGELOG.md

@@ -132,8 +132,10 @@ The table below shows which release corresponds to each branch, and what date th
 
 ## 4.12.1
 
+- [#2373][2373] Fix displaying bright color variation in terminal output
 - [#2378][2378] Don't go though a shell in `gdb.debug`
 
+[2373]: https://github.com/Gallopsled/pwntools/pull/2373
 [2378]: https://github.com/Gallopsled/pwntools/pull/2378
 
 ## 4.12.0 (`stable`)

pwnlib/term/text.py

@@ -27,9 +27,7 @@ class Module(types.ModuleType):
     def __init__(self):
         self.__file__ = __file__
         self.__name__ = __name__
-        self.num_colors = 8
-        self.has_bright = self.num_colors >= 16
-        self.has_gray = self.has_bright
+        self.num_colors = termcap.get('colors', 8) if sys.platform == 'win32' else 8
         self.when = 'auto'
         self._colors = {
             'black': 0,
@@ -61,6 +59,14 @@ def when(self):
     def when(self, val):
         self._when = eval_when(val)
 
+    @property
+    def has_bright(self):
+        return self.num_colors >= 16
+    
+    @property
+    def has_gray(self):
+        return self.has_bright
+
     def _fg_color(self, c):
         c = termcap.get('setaf', c) or termcap.get('setf', c)
         if not hasattr(c, 'encode'):