Merge "Fix python3 incompatiable code"

        skip = True

        break

    if not skip:

      new.write(line)

      new.write(line.encode())

def trim_install_recovery(original, new):

  partition.

  """

  for line in original:

    new.write(re.sub(r'[0-9a-f]{40}', '0'*40, line))

    new.write(re.sub(r'[0-9a-f]{40}', '0'*40, line).encode())

def sort_file(original, new):

  """

  lines = original.readlines()

  lines.sort()

  for line in lines:

    new.write(line)

    new.write(line.encode())

# Map files to the functions that will modify them for diffing

REWRITE_RULES = {

      if stdout == 'Binary files %s and %s differ' % (f1, f2):

        print("%s: Binary files differ" % name, file=out_file)

      else:

        for line in stdout.strip().split('\n'):

        for line in stdout.strip().split(b'\n'):

          print("%s: %s" % (name, line), file=out_file)

def recursiveDiff(prefix, dir1, dir2, out_file):