Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add lock for thread-safe access to winterm #229

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add lock for thread-safe access to winterm #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions colorama/ansitowin32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import re
import sys
import os
from threading import Lock

from .ansi import AnsiFore, AnsiBack, AnsiStyle, Style
from .winterm import WinTerm, WinColor, WinStyle
Expand All @@ -12,6 +13,7 @@
if windll is not None:
winterm = WinTerm()

winterm_lock = Lock()

class StreamWrapper(object):
'''
Expand Down Expand Up @@ -158,13 +160,17 @@ def get_win32_calls(self):
return dict()

def write(self, text):
if self.strip or self.convert:
self.write_and_convert(text)
else:
self.wrapped.write(text)
self.wrapped.flush()
if self.autoreset:
self.reset_all()
try:
winterm_lock.acquire()
if self.strip or self.convert:
self.write_and_convert(text)
else:
self.wrapped.write(text)
self.wrapped.flush()
if self.autoreset:
self.reset_all()
finally:
winterm_lock.release()


def reset_all(self):
Expand Down