Skip to content

Add one more fail-safe when decoding console to str in Py3 #4310

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

Closed
wants to merge 3 commits into from
Closed

Add one more fail-safe when decoding console to str in Py3 #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0849da0
Add one more fail-safe when decoding console to str in Py3
sakurai-youhei Feb 28, 2017
c1d918f
Add warning to make falling back to repr explicit
sakurai-youhei Mar 31, 2017
fcde182
Add a NEWS entry for #4310 which may cover #4110, #4251 and #3992
sakurai-youhei Mar 31, 2017
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
2 changes: 2 additions & 0 deletions news/4310.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Works around UnicodeDecodeError using ``repr()`` in decoding console output on
Python 3.
10 changes: 9 additions & 1 deletion pip/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import os
import sys
import warnings

from pip._vendor.six import text_type

Expand Down Expand Up @@ -41,7 +42,14 @@ def console_to_str(s):
try:
return s.decode(sys.__stdout__.encoding)
except UnicodeDecodeError:
return s.decode('utf_8')
try:
return s.decode('utf_8')
except UnicodeDecodeError:
warnings.warn(
'Could not detect stdout encoding - falling back to repr',
category=RuntimeWarning, stacklevel=2)
# Decode at least line breaks manually
return repr(s)[2:-1].replace('\\r', '\r').replace('\\n', '\n')

def native_str(s, replace=False):
if isinstance(s, bytes):
Expand Down