test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #32740 -- Caught possible exception when initializing colorama.

This commit is contained in:
Carlton Gibson 2021-05-12 15:22:34 +02:00
parent 127fd927d0
commit c2e6047c72
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/management/color.py
View File

@ -10,10 +10,10 @@ from django.utils import termcolors
try: try:
import colorama import colorama
except ImportError: colorama.init()
except (ImportError, OSError):
HAS_COLORAMA = False HAS_COLORAMA = False
else: else:
colorama.init()
HAS_COLORAMA = True HAS_COLORAMA = True

4
docs/releases/3.2.4.txt
View File

@ -18,3 +18,7 @@ Bugfixes
* Prevented unnecessary initialization of unused caches following a regression * Prevented unnecessary initialization of unused caches following a regression
in Django 3.2 (:ticket:`32747`). in Django 3.2 (:ticket:`32747`).
* Fixed a crash in Django 3.2 that could occur when running ``mod_wsgi`` with
the recommended settings while the Windows ``colorama`` library was installed
(:ticket:`32740`).