Roll version of gsutil to 4.15.

third_party/gsutil/gslib/gcs_json_media.py

 # -*- coding: utf-8 -*-
 # Copyright 2014 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 436 matching lines @@
   httplib2 handles media by storing entire chunks of responses in memory, which
   is undesirable particularly when multiple instances are used during
   multi-threaded/multi-process copy. This class copies and then overrides some
   httplib2 functions to use a streaming copy approach that uses small memory
   buffers.
 
   Also disables httplib2 retries (for reasons stated in the HttpWithNoRetries
   class doc).
   """
 
-  def __init__(self, stream=None, *args, **kwds):
-    if stream is None:
-      raise apitools_exceptions.InvalidUserInputError(
-          'Cannot create HttpWithDownloadStream with no stream')
-    self._stream = stream
+  def __init__(self, *args, **kwds):
+    self._stream = None
     self._logger = logging.getLogger()
     super(HttpWithDownloadStream, self).__init__(*args, **kwds)
 
   @property
   def stream(self):
     return self._stream
 
+  @stream.setter
+  def stream(self, value):
+    self._stream = value
+
   def _conn_request(self, conn, request_uri, method, body, headers):  # pylint: disable=too-many-statements
     try:
       if hasattr(conn, 'sock') and conn.sock is None:
         conn.connect()
       conn.request(method, request_uri, body, headers)
     except socket.timeout:
       raise
     except socket.gaierror:
       conn.close()
       raise httplib2.ServerNotFoundError(
@@ skipping 27 matching lines @@
       else:
         if response.status in (httplib.OK, httplib.PARTIAL_CONTENT):
           content_length = None
           if hasattr(response, 'msg'):
             content_length = response.getheader('content-length')
           http_stream = response
           bytes_read = 0
           while True:
             new_data = http_stream.read(TRANSFER_BUFFER_SIZE)
             if new_data:
+              if self.stream is None:
+                raise apitools_exceptions.InvalidUserInputError(
+                    'Cannot exercise HttpWithDownloadStream with no stream')
               self.stream.write(new_data)
               bytes_read += len(new_data)
             else:
               break
 
           if (content_length is not None and
               long(bytes_read) != long(content_length)):
             # The input stream terminated before we were able to read the
             # entire contents, possibly due to a network condition. Set
             # content-length to indicate how many bytes we actually read.
             self._logger.log(
                 logging.DEBUG, 'Only got %s bytes out of content-length %s '
                 'for request URI %s. Resetting content-length to match '
                 'bytes read.', bytes_read, content_length, request_uri)
             response.msg['content-length'] = str(bytes_read)
           response = httplib2.Response(response)
         else:
           # We fall back to the current httplib2 behavior if we're
           # not processing bytes (eg it's a redirect).
           content = response.read()
           response = httplib2.Response(response)
           # pylint: disable=protected-access
           content = httplib2._decompressContent(response, content)
     return (response, content)