diff options
| author | Donald Stufft <donald@stufft.io> | 2017-05-19 07:53:32 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2017-05-19 08:01:43 -0400 |
| commit | cd2bfd20a63457fd2f791e9cb30bd7070872b587 (patch) | |
| tree | db85601d4802a4a115c525323c9915d97b3f2921 /pip | |
| parent | 686ea382fe45eef337a0ff703f0d60ebcd8a313d (diff) | |
| download | pip-cd2bfd20a63457fd2f791e9cb30bd7070872b587.tar.gz | |
Upgrade colorama to 0.3.9
Diffstat (limited to 'pip')
| -rw-r--r-- | pip/_vendor/colorama/__init__.py | 2 | ||||
| -rw-r--r-- | pip/_vendor/colorama/ansitowin32.py | 4 | ||||
| -rw-r--r-- | pip/_vendor/colorama/win32.py | 10 | ||||
| -rw-r--r-- | pip/_vendor/vendor.txt | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/pip/_vendor/colorama/__init__.py b/pip/_vendor/colorama/__init__.py index 670e6b397..f4d9ce210 100644 --- a/pip/_vendor/colorama/__init__.py +++ b/pip/_vendor/colorama/__init__.py @@ -3,5 +3,5 @@ from .initialise import init, deinit, reinit, colorama_text from .ansi import Fore, Back, Style, Cursor from .ansitowin32 import AnsiToWin32 -__version__ = '0.3.7' +__version__ = '0.3.9' diff --git a/pip/_vendor/colorama/ansitowin32.py b/pip/_vendor/colorama/ansitowin32.py index b7ff6f213..1d6e6059c 100644 --- a/pip/_vendor/colorama/ansitowin32.py +++ b/pip/_vendor/colorama/ansitowin32.py @@ -46,8 +46,8 @@ class AnsiToWin32(object): sequences from the text, and if outputting to a tty, will convert them into win32 function calls. ''' - ANSI_CSI_RE = re.compile('\001?\033\[((?:\d|;)*)([a-zA-Z])\002?') # Control Sequence Introducer - ANSI_OSC_RE = re.compile('\001?\033\]((?:.|;)*?)(\x07)\002?') # Operating System Command + ANSI_CSI_RE = re.compile('\001?\033\\[((?:\\d|;)*)([a-zA-Z])\002?') # Control Sequence Introducer + ANSI_OSC_RE = re.compile('\001?\033\\]((?:.|;)*?)(\x07)\002?') # Operating System Command def __init__(self, wrapped, convert=None, strip=None, autoreset=False): # The wrapped stream (normally sys.stdout or sys.stderr) diff --git a/pip/_vendor/colorama/win32.py b/pip/_vendor/colorama/win32.py index 3d1d2f2d9..8262e350a 100644 --- a/pip/_vendor/colorama/win32.py +++ b/pip/_vendor/colorama/win32.py @@ -83,9 +83,9 @@ else: ] _FillConsoleOutputAttribute.restype = wintypes.BOOL - _SetConsoleTitleW = windll.kernel32.SetConsoleTitleA + _SetConsoleTitleW = windll.kernel32.SetConsoleTitleW _SetConsoleTitleW.argtypes = [ - wintypes.LPCSTR + wintypes.LPCWSTR ] _SetConsoleTitleW.restype = wintypes.BOOL @@ -94,13 +94,15 @@ else: STDERR: _GetStdHandle(STDERR), } - def winapi_test(): - handle = handles[STDOUT] + def _winapi_test(handle): csbi = CONSOLE_SCREEN_BUFFER_INFO() success = _GetConsoleScreenBufferInfo( handle, byref(csbi)) return bool(success) + def winapi_test(): + return any(_winapi_test(h) for h in handles.values()) + def GetConsoleScreenBufferInfo(stream_id=STDOUT): handle = handles[stream_id] csbi = CONSOLE_SCREEN_BUFFER_INFO() diff --git a/pip/_vendor/vendor.txt b/pip/_vendor/vendor.txt index 5421ae471..7bae1c241 100644 --- a/pip/_vendor/vendor.txt +++ b/pip/_vendor/vendor.txt @@ -3,7 +3,7 @@ distlib==0.2.4 distro==1.0.4 html5lib==1.0b10 six==1.10.0 -colorama==0.3.7 +colorama==0.3.9 CacheControl==0.12.2 msgpack-python==0.4.8 lockfile==0.12.2 |