Skip to content

Commit a0a136b

Browse files
committed
Port the excepts to the Python3 syntax
1 parent 77cd644 commit a0a136b

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

ometa/interp.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def parse_Or(self, expr):
260260
self.currentError = joinErrors(errors)
261261
yield x
262262
return
263-
except ParseError, err:
263+
except ParseError as err:
264264
errors.append(err)
265265
self.input = i
266266
raise self.err(joinErrors(errors))
@@ -279,7 +279,7 @@ def parse_Many(self, expr, ans=None):
279279
if x is _feed_me: yield x
280280
ans.append(x[0])
281281
self.currentError = x[1]
282-
except ParseError, err:
282+
except ParseError as err:
283283
self.input = m
284284
break
285285
yield ans, err
@@ -332,7 +332,7 @@ def parse_Repeat(self, min, max, expr):
332332
if x is _feed_me: yield x
333333
v, e = x
334334
ans.append(v)
335-
except ParseError, e:
335+
except ParseError as e:
336336
self.input = m
337337
break
338338
yield ans, e
@@ -379,10 +379,11 @@ def parse_Label(self, expr, label_term):
379379
for x in self._eval(expr):
380380
if x is _feed_me:
381381
yield x
382-
print "^^", label
382+
print ("^^", label)
383383
self.currentError = x[1].withMessage([("Custom Exception:", label, None)])
384384
yield x[0], self.currentError
385-
except ParseError, e:
385+
except ParseError as e:
386+
err=e
386387
raise self.err(e.withMessage([("Custom Exception:", label, None)]))
387388

388389

@@ -554,7 +555,8 @@ def _eval(self, run, expr):
554555
try:
555556
val, err = self._eval(run, args[0])
556557
return val, err.withMessage([("Custom Exception:", label, None)])
557-
except ParseError, e:
558+
except ParseError as err:
559+
e=err
558560
raise e.withMessage([("Custom Exception:", label, None)])
559561

560562
elif name == "Token":
@@ -570,7 +572,7 @@ def _eval(self, run, expr):
570572
m = run.input
571573
v, _ = self._eval(run, args[0])
572574
ans.append(v)
573-
except ParseError, err:
575+
except ParseError as err:
574576
run.input = m
575577
break
576578
return ans, err
@@ -598,7 +600,7 @@ def _eval(self, run, expr):
598600
m = run.input
599601
v, e = self._eval(run, args[2])
600602
ans.append(v)
601-
except ParseError, e:
603+
except ParseError as e:
602604
run.input = m
603605
break
604606
return ans, e
@@ -620,7 +622,7 @@ def _eval(self, run, expr):
620622
ret, err = x
621623
errors.append(err)
622624
return ret, joinErrors(errors)
623-
except ParseError, err:
625+
except ParseError as err:
624626
errors.append(err)
625627
run.input = m
626628
raise joinErrors(errors)
@@ -630,7 +632,7 @@ def _eval(self, run, expr):
630632
m = run.input
631633
try:
632634
self._eval(run, args[0])
633-
except ParseError, err:
635+
except ParseError as err:
634636
run.input = m
635637
return True, run.input.nullError()
636638
else:

0 commit comments

Comments
 (0)