old_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2014, John Dewey
  # 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.
  
  import logging
  import os
  import subprocess
  
  LOG = logging.getLogger(__name__)
  
  
  def execute(command, cwd=None, exit=0):
      """
      Executes a command in a subprocess.  Returns a tuple of
      (exitcode, out, err).
  
      :param command: Command string to execute.
      :param cwd: Directory to execute from.
      :param exit: The expected exit code.
      """
  
      original_dir = None
      if cwd:
          original_dir = os.getcwd()
          os.chdir(cwd)
          LOG.info("Changed directory to %s", cwd)
  
      LOG.info("Running: '%s'", command)
      process = subprocess.Popen(command,
                                 cwd=os.getcwd(),
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,
                                 shell=True)
      (out, err) = process.communicate()
      exitcode = process.wait()
  
      LOG.info("Command exitted with rc: %s; STDOUT: %s; STDERR: %s" %
                (exitcode, out, err))
  
      if cwd:
          os.chdir(original_dir)
          LOG.info("Changed directory back to %s", original_dir)
  
      if exitcode != exit:
          raise Exception("Failed to run '%s': rc: %d, out: '%s', err: '%s'" %
                          (command, exitcode, out, err))
  
      return out
  
new_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2014, John Dewey
  # 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.
  
  import logging
  import os
  import subprocess
  
  LOG = logging.getLogger(__name__)
  
  
  def execute(command, cwd=None, exit=0):
      """
      Executes a command in a subprocess.  Returns a tuple of
      (exitcode, out, err).
  
      :param command: Command string to execute.
      :param cwd: Directory to execute from.
      :param exit: The expected exit code.
      """
  
      original_dir = None
      if cwd:
          original_dir = os.getcwd()
          os.chdir(cwd)
          LOG.info("Changed directory to %s", cwd)
  
      LOG.info("Running: '%s'", command)
      process = subprocess.Popen(command,
                                 cwd=os.getcwd(),
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,
                                 shell=True)
      (out, err) = process.communicate()
      exitcode = process.wait()
  
      LOG.info("Command exitted with rc: %s; STDOUT: %s; STDERR: %s" %
               (exitcode, out, err))
  
      if cwd:
          os.chdir(original_dir)
          LOG.info("Changed directory back to %s", original_dir)
  
      if exitcode != exit:
          raise Exception("Failed to run '%s': rc: %d, out: '%s', err: '%s'" %
                          (command, exitcode, out, err))
  
      return out
  
subject: Fix pep8 failure