Better revert

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import StringIO
@@ skipping 693 matching lines @@
 def UserEditedLog(starting_text):
   """Given some starting text, let the user edit it and return the result."""
   editor = os.getenv('EDITOR', 'vi')
 
   (file_handle, filename) = tempfile.mkstemp()
   fileobj = os.fdopen(file_handle, 'w')
   fileobj.write(starting_text)
   fileobj.close()
 
   # Open up the default editor in the system to get the CL description.
-  result = None
-  try:
-    subprocess.check_call(['env', editor, filename], shell=True)
-    fileobj = open(filename)
-    result = fileobj.read()
-    fileobj.close()
-  finally:
+  ret = subprocess.call(editor + ' ' + filename, shell=True)
+  if ret != 0:
     os.remove(filename)
+    return
+  fileobj = open(filename)
+  text = fileobj.read()
+  fileobj.close()
 
-  if not result:
-    return
+  os.remove(filename)
 
   stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
-  return stripcomment_re.sub('', result).strip()
+  return stripcomment_re.sub('', text).strip()
 
 
 def ConvertToInteger(inputval):
   """Convert a string to integer, but returns either an int or None."""
   try:
     return int(inputval)
   except (TypeError, ValueError):
     return None
 
 
@@ skipping 672 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))