Merge pull request #381 from jarun/revert-373-master

Revert "Add better Windows color support using colorama"
This commit is contained in:
Mischievous Meerkat 2019-05-01 19:35:21 +05:30 committed by GitHub
commit de514b94c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

8
buku
View File

@ -4356,9 +4356,7 @@ def read_in(msg):
disable_sigint_handler() disable_sigint_handler()
message = None message = None
try: try:
# Delibrately dong this to better support Windows colorizing message = input(msg)
print(msg, end='')
message = input()
except KeyboardInterrupt: except KeyboardInterrupt:
print('Interrupted.') print('Interrupted.')
@ -4888,10 +4886,6 @@ POSITIONAL ARGUMENTS:
# only ConEmu is supported. If the user does not use ConEmu, colors are # only ConEmu is supported. If the user does not use ConEmu, colors are
# disabled unless --colors or %BUKU_COLORS% is specified. # disabled unless --colors or %BUKU_COLORS% is specified.
if sys.platform == 'win32' and os.environ.get('ConemuDir') is None: if sys.platform == 'win32' and os.environ.get('ConemuDir') is None:
try:
import colorama
colorama.init()
except ImportError:
if args.colorstr is None and colorstr_env is not None: if args.colorstr is None and colorstr_env is not None:
args.nc = True args.nc = True