Upgrade colorama to 0.4.5

Author: sbidoul

news/colorama.vendor.rst

@@ -0,0 +1 @@
+Upgrade colorama to 0.4.5

src/pip/_vendor/colorama/__init__.py

@@ -3,4 +3,4 @@
 from .ansi import Fore, Back, Style, Cursor
 from .ansitowin32 import AnsiToWin32
 
-__version__ = '0.4.4'
+__version__ = '0.4.5'

src/pip/_vendor/colorama/ansitowin32.py

@@ -37,6 +37,12 @@ def __enter__(self, *args, **kwargs):
     def __exit__(self, *args, **kwargs):
         return self.__wrapped.__exit__(*args, **kwargs)
 
+    def __setstate__(self, state):
+        self.__dict__ = state
+
+    def __getstate__(self):
+        return self.__dict__
+
     def write(self, text):
         self.__convertor.write(text)
 
@@ -57,7 +63,9 @@ def closed(self):
         stream = self.__wrapped
         try:
             return stream.closed
-        except AttributeError:
+        # AttributeError in the case that the stream doesn't support being closed
+        # ValueError for the case that the stream has already been detached when atexit runs
+        except (AttributeError, ValueError):
             return True
 
 

src/pip/_vendor/requests/__init__.py

@@ -44,7 +44,10 @@
 import warnings
 from .exceptions import RequestsDependencyWarning
 
-charset_normalizer_version = None
+try:
+    from charset_normalizer import __version__ as charset_normalizer_version
+except ImportError:
+    charset_normalizer_version = None
 
 try:
     from pip._vendor.chardet import __version__ as chardet_version
@@ -104,11 +107,6 @@ def _check_cryptography(cryptography_version):
 # if the standard library doesn't support SNI or the
 # 'ssl' library isn't available.
 try:
-    # Note: This logic prevents upgrading cryptography on Windows, if imported
-    #       as part of pip.
-    from pip._internal.utils.compat import WINDOWS
-    if not WINDOWS:
-        raise ImportError("pip internals: don't import cryptography on Windows")
     try:
         import ssl
     except ImportError:

src/pip/_vendor/requests/compat.py

@@ -8,7 +8,10 @@
 Python 3.
 """
 
-from pip._vendor import chardet
+try:
+    from pip._vendor import chardet
+except ImportError:
+    import charset_normalizer as chardet
 
 import sys
 
@@ -25,14 +28,12 @@
 #: Python 3.x?
 is_py3 = (_ver[0] == 3)
 
-# Note: We've patched out simplejson support in pip because it prevents
-#       upgrading simplejson on Windows.
-# try:
-#     import simplejson as json
-# except (ImportError, SyntaxError):
-#     # simplejson does not support Python 3.2, it throws a SyntaxError
-#     # because of u'...' Unicode literals.
-import json
+has_simplejson = False
+try:
+    import simplejson as json
+    has_simplejson = True
+except ImportError:
+    import json
 
 # ---------
 # Specifics
@@ -67,7 +68,10 @@
     # Keep OrderedDict for backwards compatibility.
     from collections import OrderedDict
     from collections.abc import Callable, Mapping, MutableMapping
-    from json import JSONDecodeError
+    if has_simplejson:
+        from simplejson import JSONDecodeError
+    else:
+        from json import JSONDecodeError
 
     builtin_str = str
     str = str

src/pip/_vendor/requests/help.py

@@ -11,7 +11,10 @@
 
 from . import __version__ as requests_version
 
-charset_normalizer = None
+try:
+    import charset_normalizer
+except ImportError:
+    charset_normalizer = None
 
 try:
     from pip._vendor import chardet

src/pip/_vendor/requests/packages.py

@@ -1,16 +1,26 @@
 import sys
 
+try:
+    from pip._vendor import chardet
+except ImportError:
+    import charset_normalizer as chardet
+    import warnings
+
+    warnings.filterwarnings('ignore', 'Trying to detect', module='charset_normalizer')
+
 # This code exists for backwards compatibility reasons.
 # I don't like it either. Just look the other way. :)
 
-for package in ('urllib3', 'idna', 'chardet'):
-    vendored_package = "pip._vendor." + package
-    locals()[package] = __import__(vendored_package)
+for package in ('urllib3', 'idna'):
+    locals()[package] = __import__(package)
     # This traversal is apparently necessary such that the identities are
     # preserved (requests.packages.urllib3.* is urllib3.*)
     for mod in list(sys.modules):
-        if mod == vendored_package or mod.startswith(vendored_package + '.'):
-            unprefixed_mod = mod[len("pip._vendor."):]
-            sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
+        if mod == package or mod.startswith(package + '.'):
+            sys.modules['requests.packages.' + mod] = sys.modules[mod]
 
+target = chardet.__name__
+for mod in list(sys.modules):
+    if mod == target or mod.startswith(target + '.'):
+        sys.modules['requests.packages.' + target.replace(target, 'chardet')] = sys.modules[mod]
 # Kinda cool, though, right?

src/pip/_vendor/vendor.txt

@@ -1,5 +1,5 @@
 CacheControl==0.12.11  # Make sure to update the license in pyproject.toml for this.
-colorama==0.4.4
+colorama==0.4.5
 distlib==0.3.3
 distro==1.7.0
 msgpack==1.0.3