old_contents: #! /usr/bin/python2.3
  # vim:sw=8:ts=8:et:nowrap
  
  import os
  import shutil
  
  def ApplyPatches(filein, fileout):
          # Generate short name such as wrans/answers2003-03-31.html
          (rest, name) = os.path.split(filein)
          (rest, dir) = os.path.split(rest)
          fileshort = os.path.join(dir, name)
  
          # Look for a patch file from our collection (which is
          # in the pyscraper/patches folder in Public Whip CVS)
          patchfile = os.path.join("patches", fileshort + ".patch")
          if not os.path.isfile(patchfile):
                  return False
  
          while True:
                  # Apply the patch
                  shutil.copyfile(filein, fileout)
  
                  # delete temporary file that might have been created by a previous patch failure 
                  filoutorg = fileout + ".orig"
                  if os.path.isfile(filoutorg):
                      os.remove(filoutorg)
                  status = os.system("patch --quiet %s <%s" % (fileout, patchfile))
  
                  if status == 0:
                          return True
  
                  print "Error running 'patch' on file %s, blanking it out" % fileshort
                  os.rename(patchfile, patchfile + ".old~")
                  blankfile = open(patchfile, "w")
                  blankfile.close()
                  
  
  
new_contents: #! /usr/bin/python2.3
  # vim:sw=8:ts=8:et:nowrap
  
  import os
  import shutil
  
  def ApplyPatches(filein, fileout):
          # Generate short name such as wrans/answers2003-03-31.html
          (rest, name) = os.path.split(filein)
          (rest, dir) = os.path.split(rest)
          fileshort = os.path.join(dir, name)
  
          # Look for a patch file from our collection (which is
          # in the pyscraper/patches folder in Public Whip CVS)
          patchfile = os.path.join("patches", fileshort + ".patch")
          if not os.path.isfile(patchfile):
                  return False
  
          while True:
                  # Apply the patch
                  shutil.copyfile(filein, fileout)
  
                  # delete temporary file that might have been created by a previous patch failure 
                  filoutorg = fileout + ".orig"
                  if os.path.isfile(filoutorg):
                      os.remove(filoutorg)
                  status = os.system("patch --quiet %s <%s" % (fileout, patchfile))
  
                  if status == 0:
                          return True
  
                  raise Exception, "Error running 'patch' on file %s" % fileshort
  
                  #print "blanking out %s" % fileshort
                  #os.rename(patchfile, patchfile + ".old~")
                  #blankfile = open(patchfile, "w")
                  #blankfile.close()
                  
  
  
subject: Remove code which blanks patch files