Revision: 23516758d79a
Branch: default
Author: Robot Framework Developers (robotframew...@gmail.com)
Date: Mon May 27 06:06:10 2013
Log: rename exception instances from (err, ret, exp, exc) to exception
http://code.google.com/p/robotframework/source/detail?r=23516758d79a
Modified:
/src/robot/running/keywords.py
/src/robot/running/userkeyword.py
=======================================
--- /src/robot/running/keywords.py Thu May 23 05:33:35 2013
+++ /src/robot/running/keywords.py Mon May 27 06:06:10 2013
@@ -49,13 +49,13 @@
for kw in self._keywords:
try:
kw.run(context)
- except ExecutionPassed, exp:
- exp.set_earlier_failures(errors)
- raise exp
- except ExecutionFailed, err:
- errors.extend(err.get_errors())
- if not err.can_continue(context.teardown, self._templated,
- context.dry_run):
+ except ExecutionPassed, exception:
+ exception.set_earlier_failures(errors)
+ raise exception
+ except ExecutionFailed, exception:
+ errors.extend(exception.get_errors())
+ if not exception.can_continue(context.teardown,
self._templated,
+ context.dry_run):
break
if errors:
raise ExecutionFailures(errors)
@@ -204,18 +204,18 @@
items, iteration_steps =
self._get_items_and_iteration_steps(context)
for i in iteration_steps:
values = items[i:i+len(self.vars)]
- err = self._run_one_round(context, self.vars, values)
- if err:
- if isinstance(err, ExitForLoop):
+ exception = self._run_one_round(context, self.vars, values)
+ if exception:
+ if isinstance(exception, ExitForLoop):
break
- if isinstance(err, ContinueForLoop):
+ if isinstance(exception, ContinueForLoop):
continue
- if isinstance(err, ExecutionPassed):
- err.set_earlier_failures(errors)
- raise err
- errors.extend(err.get_errors())
- if not err.can_continue(context.teardown, self._templated,
- context.dry_run):
+ if isinstance(exception, ExecutionPassed):
+ exception.set_earlier_failures(errors)
+ raise exception
+ errors.extend(exception.get_errors())
+ if not exception.can_continue(context.teardown,
self._templated,
+ context.dry_run):
break
if errors:
raise ExecutionFailures(errors)
=======================================
--- /src/robot/running/userkeyword.py Thu May 23 05:33:43 2013
+++ /src/robot/running/userkeyword.py Mon May 27 06:06:10 2013
@@ -181,14 +181,14 @@
error = return_ = pass_ = None
try:
self.keywords.run(context)
- except ReturnFromKeyword, ret:
- return_ = ret
- error = ret.earlier_failures
- except ExecutionPassed, exc:
- pass_ = exc
- error = exc.earlier_failures
- except ExecutionFailed, exc:
- error = exc
+ except ReturnFromKeyword, exception:
+ return_ = exception
+ error = exception.earlier_failures
+ except ExecutionPassed, exception:
+ pass_ = exception
+ error = exception.earlier_failures
+ except ExecutionFailed, exception:
+ error = exception
td_error = self._run_teardown(context, error)
if error or td_error:
error = UserKeywordExecutionFailed(error, td_error)
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
