old_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2010 United States Government as represented by the
  # Administrator of the National Aeronautics and Space Administration.
  # 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
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  """
  System-level utilities and helper functions.
  """
  
  from oslo_log import log as logging
  
  LOG = logging.getLogger(__name__)
  
  
  def chunkreadable(iter, chunk_size=65536):
      """
      Wrap a readable iterator with a reader yielding chunks of
      a preferred size, otherwise leave iterator unchanged.
  
      :param iter: an iter which may also be readable
      :param chunk_size: maximum size of chunk
      """
      return chunkiter(iter, chunk_size) if hasattr(iter, 'read') else iter
  
  
  def chunkiter(fp, chunk_size=65536):
      """
      Return an iterator to a file-like obj which yields fixed size chunks
  
      :param fp: a file-like object
      :param chunk_size: maximum size of chunk
      """
      while True:
          chunk = fp.read(chunk_size)
          if chunk:
              yield chunk
          else:
              break
  
new_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2010 United States Government as represented by the
  # Administrator of the National Aeronautics and Space Administration.
  # 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
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  """
  System-level utilities and helper functions.
  """
  
  
  def chunkreadable(iter, chunk_size=65536):
      """
      Wrap a readable iterator with a reader yielding chunks of
      a preferred size, otherwise leave iterator unchanged.
  
      :param iter: an iter which may also be readable
      :param chunk_size: maximum size of chunk
      """
      return chunkiter(iter, chunk_size) if hasattr(iter, 'read') else iter
  
  
  def chunkiter(fp, chunk_size=65536):
      """
      Return an iterator to a file-like obj which yields fixed size chunks
  
      :param fp: a file-like object
      :param chunk_size: maximum size of chunk
      """
      while True:
          chunk = fp.read(chunk_size)
          if chunk:
              yield chunk
          else:
              break
  
subject: Remove logging import unused