# HG changeset patch # User Gilles Moris # Date 1330504459 -3600 # Node ID 6ba530122d8bbc809258d96b4234a6dd8dc3a90b # Parent b468cea3f29d3219b6d1f4b4a13e4c18debd1c17 bookmarks: restore python 2.4 compatibility Remove py25 'try except finally' clause. diff -r b468cea3f29d -r 6ba530122d8b mercurial/bookmarks.py --- a/mercurial/bookmarks.py Wed Feb 29 17:43:03 2012 +0000 +++ b/mercurial/bookmarks.py Wed Feb 29 09:34:19 2012 +0100 @@ -129,11 +129,12 @@ def unsetcurrent(repo): wlock = repo.wlock() try: - util.unlink(repo.join('bookmarks.current')) - repo._bookmarkcurrent = None - except OSError, inst: - if inst.errno != errno.ENOENT: - raise + try: + util.unlink(repo.join('bookmarks.current')) + repo._bookmarkcurrent = None + except OSError, inst: + if inst.errno != errno.ENOENT: + raise finally: wlock.release()