Repository: thrift Updated Branches: refs/heads/master efd14e7c2 -> 7726b03ac
THRIFT-1857 Python 3.X Support - Replace deprecated "," with "as" in python exception generation code. Patch: George Leslie-Waksman This closes #440 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/7726b03a Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/7726b03a Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/7726b03a Branch: refs/heads/master Commit: 7726b03ac11c54502dad3a72c124c24fc17db1b3 Parents: efd14e7 Author: Roger Meier <[email protected]> Authored: Tue Apr 14 21:47:58 2015 +0200 Committer: Roger Meier <[email protected]> Committed: Tue Apr 14 21:47:58 2015 +0200 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_py_generator.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/7726b03a/compiler/cpp/src/generate/t_py_generator.cc ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc index 2228764..a21dff1 100644 --- a/compiler/cpp/src/generate/t_py_generator.cc +++ b/compiler/cpp/src/generate/t_py_generator.cc @@ -1701,7 +1701,7 @@ void t_py_generator::generate_process_function(t_service* tservice, t_function* // Kinda absurd f_service_ << indent() << " error.raiseException()" << endl; for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) { - f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << ", " + f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << " as " << (*x_iter)->get_name() << ":" << endl; if (!tfunction->is_oneway()) { indent_up(); @@ -1773,7 +1773,7 @@ void t_py_generator::generate_process_function(t_service* tservice, t_function* if (!tfunction->is_oneway() && xceptions.size() > 0) { indent_down(); for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) { - f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << ", " + f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << " as " << (*x_iter)->get_name() << ":" << endl; if (!tfunction->is_oneway()) { indent_up(); @@ -1828,7 +1828,7 @@ void t_py_generator::generate_process_function(t_service* tservice, t_function* if (!tfunction->is_oneway() && xceptions.size() > 0) { indent_down(); for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) { - f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << ", " + f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << " as " << (*x_iter)->get_name() << ":" << endl; if (!tfunction->is_oneway()) { indent_up();
