Chromium Code Reviews| Index: git_cl/git_cl.py |
| =================================================================== |
| --- git_cl/git_cl.py (revision 77908) |
| +++ git_cl/git_cl.py (working copy) |
| @@ -710,17 +710,20 @@ |
| fileobj.write(starting_text) |
| fileobj.close() |
| - ret = subprocess.call(editor + ' ' + filename, shell=True) |
| - if ret != 0: |
| + result = None |
|
M-A Ruel
2011/03/12 02:17:43
not needed
|
| + try: |
| + subprocess.check_call(['env', editor, filename], shell=True) |
| + fileobj = open(filename) |
| + result = fileobj.read() |
| + fileobj.close() |
| + finally: |
| os.remove(filename) |
| + |
| + if not result: |
| return |
| - |
| - fileobj = open(filename) |
| - text = fileobj.read() |
| - fileobj.close() |
| - os.remove(filename) |
| + |
| stripcomment_re = re.compile(r'^#.*$', re.MULTILINE) |
| - return stripcomment_re.sub('', text).strip() |
| + return stripcomment_re.sub('', result).strip() |
| def ConvertToInteger(inputval): |