comparison hgext/transplant.py @ 25660:328739ea70c3

global: mass rewrite to use modern exception syntax Python 2.6 introduced the "except type as instance" syntax, replacing the "except type, instance" syntax that came before. Python 3 dropped support for the latter syntax. Since we no longer support Python 2.4 or 2.5, we have no need to continue supporting the "except type, instance". This patch mass rewrites the exception syntax to be Python 2.6+ and Python 3 compatible. This patch was produced by running `2to3 -f except -w -n .`.
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 23 Jun 2015 22:20:08 -0700
parents 80c5b2666a96
children ce3d4b858420
comparison
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
270 if patchfile: 270 if patchfile:
271 try: 271 try:
272 files = set() 272 files = set()
273 patch.patch(self.ui, repo, patchfile, files=files, eolmode=None) 273 patch.patch(self.ui, repo, patchfile, files=files, eolmode=None)
274 files = list(files) 274 files = list(files)
275 except Exception, inst: 275 except Exception as inst:
276 seriespath = os.path.join(self.path, 'series') 276 seriespath = os.path.join(self.path, 'series')
277 if os.path.exists(seriespath): 277 if os.path.exists(seriespath):
278 os.unlink(seriespath) 278 os.unlink(seriespath)
279 p1 = repo.dirstate.p1() 279 p1 = repo.dirstate.p1()
280 p2 = node 280 p2 = node