cherry-pick 465425c from develop: Get rid of backwardcompat.fwrite() as it doesn't do what it seems to1.4.X

2 files changed, 3 insertions, 7 deletions

diff --git a/pip/backwardcompat/__init__.py b/pip/backwardcompat/__init__.py
index 465759d80..5a4f2c783 100644
--- a/pip/backwardcompat/__init__.py
+++ b/pip/backwardcompat/__init__.py
@@ -55,9 +55,6 @@ if sys.version_info >= (3,):
         except UnicodeDecodeError:
             return s.decode('utf_8')
 
-    def fwrite(f, s):
-        f.buffer.write(b(s))
-
     def get_http_message_param(http_message, param, default_value):
         return http_message.get_param(param, default_value)
 
@@ -86,9 +83,6 @@ else:
     def console_to_str(s):
         return s
 
-    def fwrite(f, s):
-        f.write(s)
-
     def get_http_message_param(http_message, param, default_value):
         result = http_message.getparam(param)
         return result or default_value
diff --git a/pip/log.py b/pip/log.py
index 9eb02b90d..ef68d920f 100644
--- a/pip/log.py
+++ b/pip/log.py
@@ -72,7 +72,9 @@ class Logger(object):
                         rendered = '%02i %s' % (level, rendered)
                 if hasattr(consumer, 'write'):
                     rendered += '\n'
-                    backwardcompat.fwrite(consumer, rendered)
+                    consumer.write(rendered)
+                    if hasattr(consumer, 'flush'):
+                        consumer.flush()
                 else:
                     consumer(rendered)