From 209a7ff5f6a0acdaf38f766a02900773d2278d2c Mon Sep 17 00:00:00 2001 From: Donald Stufft Date: Thu, 11 Sep 2014 19:13:42 -0400 Subject: [PATCH] Move the encoding down into the Python 3 block --- pip/compat/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pip/compat/__init__.py b/pip/compat/__init__.py index c64117cc3..dc460ba54 100644 --- a/pip/compat/__init__.py +++ b/pip/compat/__init__.py @@ -9,12 +9,10 @@ import imp import sys import site + uses_pycache = hasattr(imp, 'cache_from_source') -console_encoding = sys.__stdout__.encoding - - try: from logging.config import dictConfig as logging_dictConfig except ImportError: @@ -24,7 +22,7 @@ except ImportError: if sys.version_info >= (3,): def console_to_str(s): try: - return s.decode(console_encoding) + return s.decode(sys.__stdout__.encoding) except UnicodeDecodeError: return s.decode('utf_8')