You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by hc...@apache.org on 2014/11/18 10:02:44 UTC
[16/37] thrift git commit: THRIFT-2729: C++ - .clang-format created
and applied
http://git-wip-us.apache.org/repos/asf/thrift/blob/74260aa9/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 924bcc7..50af776 100644
--- a/compiler/cpp/src/generate/t_py_generator.cc
+++ b/compiler/cpp/src/generate/t_py_generator.cc
@@ -38,21 +38,19 @@ using std::string;
using std::stringstream;
using std::vector;
-static const string endl = "\n"; // avoid ostream << std::endl flushes
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Python code generator.
*
*/
class t_py_generator : public t_generator {
- public:
- t_py_generator(
- t_program* program,
- const std::map<std::string, std::string>& parsed_options,
- const std::string& option_string)
- : t_generator(program)
- {
- (void) option_string;
+public:
+ t_py_generator(t_program* program,
+ const std::map<std::string, std::string>& parsed_options,
+ const std::string& option_string)
+ : t_generator(program) {
+ (void)option_string;
std::map<std::string, std::string>::const_iterator iter;
iter = parsed_options.find("new_style");
@@ -123,12 +121,12 @@ class t_py_generator : public t_generator {
* Program-level generation functions
*/
- void generate_typedef (t_typedef* ttypedef);
- void generate_enum (t_enum* tenum);
- void generate_const (t_const* tconst);
- void generate_struct (t_struct* tstruct);
- void generate_xception (t_struct* txception);
- void generate_service (t_service* tservice);
+ void generate_typedef(t_typedef* ttypedef);
+ void generate_enum(t_enum* tenum);
+ void generate_const(t_const* tconst);
+ void generate_struct(t_struct* tstruct);
+ void generate_xception(t_struct* txception);
+ void generate_service(t_service* tservice);
std::string render_const_value(t_type* type, t_const_value* value);
@@ -137,7 +135,10 @@ class t_py_generator : public t_generator {
*/
void generate_py_struct(t_struct* tstruct, bool is_exception);
- void generate_py_struct_definition(std::ofstream& out, t_struct* tstruct, bool is_xception=false, bool is_result=false);
+ void generate_py_struct_definition(std::ofstream& out,
+ t_struct* tstruct,
+ bool is_xception = false,
+ bool is_result = false);
void generate_py_struct_reader(std::ofstream& out, t_struct* tstruct);
void generate_py_struct_writer(std::ofstream& out, t_struct* tstruct);
void generate_py_struct_required_validator(std::ofstream& out, t_struct* tstruct);
@@ -147,80 +148,59 @@ class t_py_generator : public t_generator {
* Service-level generation functions
*/
- void generate_service_helpers (t_service* tservice);
- void generate_service_interface (t_service* tservice);
- void generate_service_client (t_service* tservice);
- void generate_service_remote (t_service* tservice);
- void generate_service_server (t_service* tservice);
- void generate_process_function (t_service* tservice, t_function* tfunction);
+ void generate_service_helpers(t_service* tservice);
+ void generate_service_interface(t_service* tservice);
+ void generate_service_client(t_service* tservice);
+ void generate_service_remote(t_service* tservice);
+ void generate_service_server(t_service* tservice);
+ void generate_process_function(t_service* tservice, t_function* tfunction);
/**
* Serialization constructs
*/
- void generate_deserialize_field (std::ofstream &out,
- t_field* tfield,
- std::string prefix="",
- bool inclass=false);
+ void generate_deserialize_field(std::ofstream& out,
+ t_field* tfield,
+ std::string prefix = "",
+ bool inclass = false);
- void generate_deserialize_struct (std::ofstream &out,
- t_struct* tstruct,
- std::string prefix="");
+ void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
- void generate_deserialize_container (std::ofstream &out,
- t_type* ttype,
- std::string prefix="");
+ void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
- void generate_deserialize_set_element (std::ofstream &out,
- t_set* tset,
- std::string prefix="");
+ void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
- void generate_deserialize_map_element (std::ofstream &out,
- t_map* tmap,
- std::string prefix="");
+ void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
- void generate_deserialize_list_element (std::ofstream &out,
- t_list* tlist,
- std::string prefix="");
+ void generate_deserialize_list_element(std::ofstream& out,
+ t_list* tlist,
+ std::string prefix = "");
- void generate_serialize_field (std::ofstream &out,
- t_field* tfield,
- std::string prefix="");
+ void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
- void generate_serialize_struct (std::ofstream &out,
- t_struct* tstruct,
- std::string prefix="");
+ void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
- void generate_serialize_container (std::ofstream &out,
- t_type* ttype,
- std::string prefix="");
+ void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
- void generate_serialize_map_element (std::ofstream &out,
- t_map* tmap,
- std::string kiter,
- std::string viter);
+ void generate_serialize_map_element(std::ofstream& out,
+ t_map* tmap,
+ std::string kiter,
+ std::string viter);
- void generate_serialize_set_element (std::ofstream &out,
- t_set* tmap,
- std::string iter);
+ void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
- void generate_serialize_list_element (std::ofstream &out,
- t_list* tlist,
- std::string iter);
+ void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
- void generate_python_docstring (std::ofstream& out,
- t_struct* tstruct);
+ void generate_python_docstring(std::ofstream& out, t_struct* tstruct);
- void generate_python_docstring (std::ofstream& out,
- t_function* tfunction);
+ void generate_python_docstring(std::ofstream& out, t_function* tfunction);
- void generate_python_docstring (std::ofstream& out,
- t_doc* tdoc,
- t_struct* tstruct,
- const char* subheader);
+ void generate_python_docstring(std::ofstream& out,
+ t_doc* tdoc,
+ t_struct* tstruct,
+ const char* subheader);
- void generate_python_docstring (std::ofstream& out,
- t_doc* tdoc);
+ void generate_python_docstring(std::ofstream& out, t_doc* tdoc);
/**
* Helper rendering functions
@@ -233,11 +213,10 @@ class t_py_generator : public t_generator {
std::string declare_argument(t_field* tfield);
std::string render_field_default_value(t_field* tfield);
std::string type_name(t_type* ttype);
- std::string function_signature(t_function* tfunction,
- bool interface=false);
+ std::string function_signature(t_function* tfunction, bool interface = false);
std::string argument_list(t_struct* tstruct,
- std::vector<std::string> *pre=NULL,
- std::vector<std::string> *post=NULL);
+ std::vector<std::string>* pre = NULL,
+ std::vector<std::string>* post = NULL);
std::string type_to_enum(t_type* ttype);
std::string type_to_spec_args(t_type* ttype);
@@ -246,9 +225,9 @@ class t_py_generator : public t_generator {
}
static std::string get_real_py_module(const t_program* program, bool gen_twisted) {
- if(gen_twisted) {
+ if (gen_twisted) {
std::string twisted_module = program->get_namespace("py.twisted");
- if(!twisted_module.empty()){
+ if (!twisted_module.empty()) {
return twisted_module;
}
}
@@ -260,16 +239,15 @@ class t_py_generator : public t_generator {
return real_module;
}
- private:
-
+private:
/**
* True if we should generate new-style classes.
*/
bool gen_newstyle_;
- /**
- * True if we should generate dynamic style classes.
- */
+ /**
+ * True if we should generate dynamic style classes.
+ */
bool gen_dynamic_;
bool gen_dynbase_;
@@ -307,10 +285,8 @@ class t_py_generator : public t_generator {
std::string package_dir_;
std::string module_;
-
};
-
/**
* Prepares for file generation by opening up the necessary file output
* streams.
@@ -325,7 +301,7 @@ void t_py_generator::init_generator() {
while (true) {
// TODO: Do better error checking here.
MKDIR(package_dir_.c_str());
- std::ofstream init_py((package_dir_+"/__init__.py").c_str(), std::ios_base::app);
+ std::ofstream init_py((package_dir_ + "/__init__.py").c_str(), std::ios_base::app);
init_py.close();
if (module.empty()) {
break;
@@ -338,22 +314,21 @@ void t_py_generator::init_generator() {
} else {
package_dir_ += "/";
package_dir_ += module.substr(0, pos);
- module.erase(0, pos+1);
+ module.erase(0, pos + 1);
}
}
// Make output file
- string f_types_name = package_dir_+"/"+"ttypes.py";
+ string f_types_name = package_dir_ + "/" + "ttypes.py";
f_types_.open(f_types_name.c_str());
- string f_consts_name = package_dir_+"/"+"constants.py";
+ string f_consts_name = package_dir_ + "/" + "constants.py";
f_consts_.open(f_consts_name.c_str());
- string f_init_name = package_dir_+"/__init__.py";
+ string f_init_name = package_dir_ + "/__init__.py";
ofstream f_init;
f_init.open(f_init_name.c_str());
- f_init <<
- "__all__ = ['ttypes', 'constants'";
+ f_init << "__all__ = ['ttypes', 'constants'";
vector<t_service*> services = program_->get_services();
vector<t_service*>::iterator sv_iter;
for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
@@ -363,18 +338,11 @@ void t_py_generator::init_generator() {
f_init.close();
// Print header
- f_types_ <<
- py_autogen_comment() << endl <<
- py_imports() << endl <<
- render_includes() << endl <<
- render_fastbinary_includes() <<
- endl << endl;
-
- f_consts_ <<
- py_autogen_comment() << endl <<
- py_imports() << endl <<
- "from ttypes import *" << endl <<
- endl;
+ f_types_ << py_autogen_comment() << endl << py_imports() << endl << render_includes() << endl
+ << render_fastbinary_includes() << endl << endl;
+
+ f_consts_ << py_autogen_comment() << endl << py_imports() << endl << "from ttypes import *"
+ << endl << endl;
}
/**
@@ -400,13 +368,12 @@ string t_py_generator::render_fastbinary_includes() {
if (gen_dynamic_) {
hdr += std::string(import_dynbase_);
} else {
- hdr +=
- "from thrift.transport import TTransport\n"
- "from thrift.protocol import TBinaryProtocol, TProtocol\n"
- "try:\n"
- " from thrift.protocol import fastbinary\n"
- "except:\n"
- " fastbinary = None\n";
+ hdr += "from thrift.transport import TTransport\n"
+ "from thrift.protocol import TBinaryProtocol, TProtocol\n"
+ "try:\n"
+ " from thrift.protocol import fastbinary\n"
+ "except:\n"
+ " fastbinary = None\n";
}
return hdr;
}
@@ -415,22 +382,16 @@ string t_py_generator::render_fastbinary_includes() {
* Autogen'd comment
*/
string t_py_generator::py_autogen_comment() {
- return
- std::string("#\n") +
- "# Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n" +
- "#\n" +
- "# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" +
- "#\n" +
- "# options string: " + copy_options_ + "\n" +
- "#\n";
+ return std::string("#\n") + "# Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
+ + "#\n" + "# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" + "#\n"
+ + "# options string: " + copy_options_ + "\n" + "#\n";
}
/**
* Prints standard thrift imports
*/
string t_py_generator::py_imports() {
- return
- string("from thrift.Thrift import TType, TMessageType, TException, TApplicationException");
+ return string("from thrift.Thrift import TType, TMessageType, TException, TApplicationException");
}
/**
@@ -448,7 +409,7 @@ void t_py_generator::close_generator() {
* @param ttypedef The type definition
*/
void t_py_generator::generate_typedef(t_typedef* ttypedef) {
- (void) ttypedef;
+ (void)ttypedef;
}
/**
@@ -460,11 +421,8 @@ void t_py_generator::generate_typedef(t_typedef* ttypedef) {
void t_py_generator::generate_enum(t_enum* tenum) {
std::ostringstream to_string_mapping, from_string_mapping;
- f_types_ <<
- "class " << tenum->get_name() <<
- (gen_newstyle_ ? "(object)" : "") <<
- (gen_dynamic_ ? "(" + gen_dynbaseclass_ + ")" : "") <<
- ":" << endl;
+ f_types_ << "class " << tenum->get_name() << (gen_newstyle_ ? "(object)" : "")
+ << (gen_dynamic_ ? "(" + gen_dynbaseclass_ + ")" : "") << ":" << endl;
indent_up();
generate_python_docstring(f_types_, tenum);
@@ -478,12 +436,10 @@ void t_py_generator::generate_enum(t_enum* tenum) {
indent(f_types_) << (*c_iter)->get_name() << " = " << value << endl;
// Dictionaries to/from string names of enums
- to_string_mapping <<
- indent() << indent() << value << ": \"" <<
- escape_string((*c_iter)->get_name()) << "\"," << endl;
- from_string_mapping <<
- indent() << indent() << '"' << escape_string((*c_iter)->get_name()) <<
- "\": " << value << ',' << endl;
+ to_string_mapping << indent() << indent() << value << ": \""
+ << escape_string((*c_iter)->get_name()) << "\"," << endl;
+ from_string_mapping << indent() << indent() << '"' << escape_string((*c_iter)->get_name())
+ << "\": " << value << ',' << endl;
}
to_string_mapping << indent() << "}" << endl;
from_string_mapping << indent() << "}" << endl;
@@ -633,8 +589,7 @@ void t_py_generator::generate_xception(t_struct* txception) {
/**
* Generates a python struct
*/
-void t_py_generator::generate_py_struct(t_struct* tstruct,
- bool is_exception) {
+void t_py_generator::generate_py_struct(t_struct* tstruct, bool is_exception) {
generate_py_struct_definition(f_types_, tstruct, is_exception);
}
@@ -647,13 +602,12 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
t_struct* tstruct,
bool is_exception,
bool is_result) {
- (void) is_result;
+ (void)is_result;
const vector<t_field*>& members = tstruct->get_members();
const vector<t_field*>& sorted_members = tstruct->get_sorted_members();
vector<t_field*>::const_iterator m_iter;
- out << std::endl <<
- "class " << tstruct->get_name();
+ out << std::endl << "class " << tstruct->get_name();
if (is_exception) {
if (gen_dynamic_) {
out << "(" << gen_dynbaseclass_exc_ << ")";
@@ -697,11 +651,10 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
indent(out) << "__slots__ = [ " << endl;
indent_up();
for (m_iter = sorted_members.begin(); m_iter != sorted_members.end(); ++m_iter) {
- indent(out) << "'" << (*m_iter)->get_name() << "'," << endl;
+ indent(out) << "'" << (*m_iter)->get_name() << "'," << endl;
}
indent_down();
indent(out) << " ]" << endl << endl;
-
}
// TODO(dreiss): Look into generating an empty tuple instead of None
@@ -719,16 +672,15 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
indent(out) << "None, # " << sorted_keys_pos << endl;
}
- indent(out) << "(" << (*m_iter)->get_key() << ", "
- << type_to_enum((*m_iter)->get_type()) << ", "
- << "'" << (*m_iter)->get_name() << "'" << ", "
- << type_to_spec_args((*m_iter)->get_type()) << ", "
- << render_field_default_value(*m_iter) << ", "
- << "),"
- << " # " << sorted_keys_pos
- << endl;
+ indent(out) << "(" << (*m_iter)->get_key() << ", " << type_to_enum((*m_iter)->get_type())
+ << ", "
+ << "'" << (*m_iter)->get_name() << "'"
+ << ", " << type_to_spec_args((*m_iter)->get_type()) << ", "
+ << render_field_default_value(*m_iter) << ", "
+ << "),"
+ << " # " << sorted_keys_pos << endl;
- sorted_keys_pos ++;
+ sorted_keys_pos++;
}
indent_down();
@@ -737,10 +689,8 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
indent(out) << "thrift_spec = None" << endl;
}
-
if (members.size() > 0) {
- out <<
- indent() << "def __init__(self,";
+ out << indent() << "def __init__(self,";
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
// This fills in default values, as opposed to nulls
@@ -755,14 +705,12 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
// Initialize fields
t_type* type = (*m_iter)->get_type();
if (!type->is_base_type() && !type->is_enum() && (*m_iter)->get_value() != NULL) {
- indent(out) <<
- "if " << (*m_iter)->get_name() << " is " << "self.thrift_spec[" <<
- (*m_iter)->get_key() << "][4]:" << endl;
- indent(out) << " " << (*m_iter)->get_name() << " = " <<
- render_field_default_value(*m_iter) << endl;
+ indent(out) << "if " << (*m_iter)->get_name() << " is "
+ << "self.thrift_spec[" << (*m_iter)->get_key() << "][4]:" << endl;
+ indent(out) << " " << (*m_iter)->get_name() << " = " << render_field_default_value(*m_iter)
+ << endl;
}
- indent(out) <<
- "self." << (*m_iter)->get_name() << " = " << (*m_iter)->get_name() << endl;
+ indent(out) << "self." << (*m_iter)->get_name() << " = " << (*m_iter)->get_name() << endl;
}
indent_down();
@@ -779,15 +727,13 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
// because when raised exceptions are printed to the console, __repr__
// isn't used. See python bug #5882
if (is_exception) {
- out <<
- indent() << "def __str__(self):" << endl <<
- indent() << " return repr(self)" << endl <<
- endl;
+ out << indent() << "def __str__(self):" << endl << indent() << " return repr(self)" << endl
+ << endl;
}
out << indent() << "def __hash__(self):" << endl;
indent_up();
- indent(out) << "value = 17" << endl; // PYTHONHASHSEED would be better, but requires Python 3.2.3
+ indent(out) << "value = 17" << endl; // PYTHONHASHSEED would be better, but requires Python 3.2.3
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
indent(out) << "value = (value * 31) ^ hash(self." << (*m_iter)->get_name() + ")" << endl;
}
@@ -795,61 +741,46 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
indent_down();
out << endl;
-
if (!gen_slots_) {
// Printing utilities so that on the command line thrift
// structs look pretty like dictionaries
- out <<
- indent() << "def __repr__(self):" << endl <<
- indent() << " L = ['%s=%r' % (key, value)" << endl <<
- indent() << " for key, value in self.__dict__.iteritems()]" << endl <<
- indent() << " return '%s(%s)' % (self.__class__.__name__, ', '.join(L))" << endl <<
- endl;
+ out << indent() << "def __repr__(self):" << endl << indent() << " L = ['%s=%r' % (key, value)"
+ << endl << indent() << " for key, value in self.__dict__.iteritems()]" << endl
+ << indent() << " return '%s(%s)' % (self.__class__.__name__, ', '.join(L))" << endl
+ << endl;
// Equality and inequality methods that compare by value
- out <<
- indent() << "def __eq__(self, other):" << endl;
+ out << indent() << "def __eq__(self, other):" << endl;
indent_up();
- out <<
- indent() << "return isinstance(other, self.__class__) and "
- "self.__dict__ == other.__dict__" << endl;
+ out << indent() << "return isinstance(other, self.__class__) and "
+ "self.__dict__ == other.__dict__" << endl;
indent_down();
out << endl;
- out <<
- indent() << "def __ne__(self, other):" << endl;
+ out << indent() << "def __ne__(self, other):" << endl;
indent_up();
- out <<
- indent() << "return not (self == other)" << endl;
+ out << indent() << "return not (self == other)" << endl;
indent_down();
} else if (!gen_dynamic_) {
// no base class available to implement __eq__ and __repr__ and __ne__ for us
// so we must provide one that uses __slots__
- out <<
- indent() << "def __repr__(self):" << endl <<
- indent() << " L = ['%s=%r' % (key, getattr(self, key))" << endl <<
- indent() << " for key in self.__slots__]" << endl <<
- indent() << " return '%s(%s)' % (self.__class__.__name__, ', '.join(L))" << endl <<
- endl;
+ out << indent() << "def __repr__(self):" << endl << indent()
+ << " L = ['%s=%r' % (key, getattr(self, key))" << endl << indent()
+ << " for key in self.__slots__]" << endl << indent()
+ << " return '%s(%s)' % (self.__class__.__name__, ', '.join(L))" << endl << endl;
// Equality method that compares each attribute by value and type, walking __slots__
- out <<
- indent() << "def __eq__(self, other):" << endl <<
- indent() << " if not isinstance(other, self.__class__):" << endl <<
- indent() << " return False" << endl <<
- indent() << " for attr in self.__slots__:" << endl <<
- indent() << " my_val = getattr(self, attr)" << endl <<
- indent() << " other_val = getattr(other, attr)" << endl <<
- indent() << " if my_val != other_val:" << endl <<
- indent() << " return False" << endl <<
- indent() << " return True" << endl <<
- endl;
-
- out <<
- indent() << "def __ne__(self, other):" << endl <<
- indent() << " return not (self == other)" << endl <<
- endl;
+ out << indent() << "def __eq__(self, other):" << endl << indent()
+ << " if not isinstance(other, self.__class__):" << endl << indent() << " return False"
+ << endl << indent() << " for attr in self.__slots__:" << endl << indent()
+ << " my_val = getattr(self, attr)" << endl << indent()
+ << " other_val = getattr(other, attr)" << endl << indent()
+ << " if my_val != other_val:" << endl << indent() << " return False" << endl
+ << indent() << " return True" << endl << endl;
+
+ out << indent() << "def __ne__(self, other):" << endl << indent()
+ << " return not (self == other)" << endl << endl;
}
indent_down();
}
@@ -857,93 +788,75 @@ void t_py_generator::generate_py_struct_definition(ofstream& out,
/**
* Generates the read method for a struct
*/
-void t_py_generator::generate_py_struct_reader(ofstream& out,
- t_struct* tstruct) {
+void t_py_generator::generate_py_struct_reader(ofstream& out, t_struct* tstruct) {
const vector<t_field*>& fields = tstruct->get_members();
vector<t_field*>::const_iterator f_iter;
- indent(out) <<
- "def read(self, iprot):" << endl;
+ indent(out) << "def read(self, iprot):" << endl;
indent_up();
- indent(out) <<
- "if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated "
- "and isinstance(iprot.trans, TTransport.CReadableTransport) "
- "and self.thrift_spec is not None "
- "and fastbinary is not None:" << endl;
+ indent(out) << "if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated "
+ "and isinstance(iprot.trans, TTransport.CReadableTransport) "
+ "and self.thrift_spec is not None "
+ "and fastbinary is not None:" << endl;
indent_up();
- indent(out) <<
- "fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))" << endl;
- indent(out) <<
- "return" << endl;
+ indent(out) << "fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))"
+ << endl;
+ indent(out) << "return" << endl;
indent_down();
- indent(out) <<
- "iprot.readStructBegin()" << endl;
+ indent(out) << "iprot.readStructBegin()" << endl;
// Loop over reading in fields
- indent(out) <<
- "while True:" << endl;
- indent_up();
+ indent(out) << "while True:" << endl;
+ indent_up();
- // Read beginning field marker
- indent(out) <<
- "(fname, ftype, fid) = iprot.readFieldBegin()" << endl;
+ // Read beginning field marker
+ indent(out) << "(fname, ftype, fid) = iprot.readFieldBegin()" << endl;
- // Check for field STOP marker and break
- indent(out) <<
- "if ftype == TType.STOP:" << endl;
- indent_up();
- indent(out) <<
- "break" << endl;
- indent_down();
+ // Check for field STOP marker and break
+ indent(out) << "if ftype == TType.STOP:" << endl;
+ indent_up();
+ indent(out) << "break" << endl;
+ indent_down();
- // Switch statement on the field we are reading
- bool first = true;
+ // Switch statement on the field we are reading
+ bool first = true;
- // Generate deserialization code for known cases
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if (first) {
- first = false;
- out <<
- indent() << "if ";
- } else {
- out <<
- indent() << "elif ";
- }
- out << "fid == " << (*f_iter)->get_key() << ":" << endl;
- indent_up();
- indent(out) << "if ftype == " << type_to_enum((*f_iter)->get_type()) << ":" << endl;
- indent_up();
- generate_deserialize_field(out, *f_iter, "self.");
- indent_down();
- out <<
- indent() << "else:" << endl <<
- indent() << " iprot.skip(ftype)" << endl;
- indent_down();
+ // Generate deserialization code for known cases
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if (first) {
+ first = false;
+ out << indent() << "if ";
+ } else {
+ out << indent() << "elif ";
}
+ out << "fid == " << (*f_iter)->get_key() << ":" << endl;
+ indent_up();
+ indent(out) << "if ftype == " << type_to_enum((*f_iter)->get_type()) << ":" << endl;
+ indent_up();
+ generate_deserialize_field(out, *f_iter, "self.");
+ indent_down();
+ out << indent() << "else:" << endl << indent() << " iprot.skip(ftype)" << endl;
+ indent_down();
+ }
- // In the default case we skip the field
- out <<
- indent() << "else:" << endl <<
- indent() << " iprot.skip(ftype)" << endl;
+ // In the default case we skip the field
+ out << indent() << "else:" << endl << indent() << " iprot.skip(ftype)" << endl;
- // Read field end marker
- indent(out) <<
- "iprot.readFieldEnd()" << endl;
+ // Read field end marker
+ indent(out) << "iprot.readFieldEnd()" << endl;
- indent_down();
+ indent_down();
- indent(out) <<
- "iprot.readStructEnd()" << endl;
+ indent(out) << "iprot.readStructEnd()" << endl;
- indent_down();
+ indent_down();
out << endl;
}
-void t_py_generator::generate_py_struct_writer(ofstream& out,
- t_struct* tstruct) {
+void t_py_generator::generate_py_struct_writer(ofstream& out, t_struct* tstruct) {
string name = tstruct->get_name();
const vector<t_field*>& fields = tstruct->get_sorted_members();
vector<t_field*>::const_iterator f_iter;
@@ -951,57 +864,48 @@ void t_py_generator::generate_py_struct_writer(ofstream& out,
indent(out) << "def write(self, oprot):" << endl;
indent_up();
- indent(out) <<
- "if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated "
- "and self.thrift_spec is not None "
- "and fastbinary is not None:" << endl;
+ indent(out) << "if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated "
+ "and self.thrift_spec is not None "
+ "and fastbinary is not None:" << endl;
indent_up();
- indent(out) <<
- "oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))" << endl;
- indent(out) <<
- "return" << endl;
+ indent(out)
+ << "oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))"
+ << endl;
+ indent(out) << "return" << endl;
indent_down();
- indent(out) <<
- "oprot.writeStructBegin('" << name << "')" << endl;
+ indent(out) << "oprot.writeStructBegin('" << name << "')" << endl;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
// Write field header
- indent(out) <<
- "if self." << (*f_iter)->get_name() << " is not None:" << endl;
+ indent(out) << "if self." << (*f_iter)->get_name() << " is not None:" << endl;
indent_up();
- indent(out) <<
- "oprot.writeFieldBegin(" <<
- "'" << (*f_iter)->get_name() << "', " <<
- type_to_enum((*f_iter)->get_type()) << ", " <<
- (*f_iter)->get_key() << ")" << endl;
+ indent(out) << "oprot.writeFieldBegin("
+ << "'" << (*f_iter)->get_name() << "', " << type_to_enum((*f_iter)->get_type())
+ << ", " << (*f_iter)->get_key() << ")" << endl;
// Write field contents
generate_serialize_field(out, *f_iter, "self.");
// Write field closer
- indent(out) <<
- "oprot.writeFieldEnd()" << endl;
+ indent(out) << "oprot.writeFieldEnd()" << endl;
indent_down();
}
// Write the struct map
- out <<
- indent() << "oprot.writeFieldStop()" << endl <<
- indent() << "oprot.writeStructEnd()" << endl;
+ out << indent() << "oprot.writeFieldStop()" << endl << indent() << "oprot.writeStructEnd()"
+ << endl;
out << endl;
indent_down();
generate_py_struct_required_validator(out, tstruct);
- out <<
- endl;
+ out << endl;
}
-void t_py_generator::generate_py_struct_required_validator(ofstream& out,
- t_struct* tstruct) {
+void t_py_generator::generate_py_struct_required_validator(ofstream& out, t_struct* tstruct) {
indent(out) << "def validate(self):" << endl;
indent_up();
@@ -1014,8 +918,8 @@ void t_py_generator::generate_py_struct_required_validator(ofstream& out,
t_field* field = (*f_iter);
if (field->get_req() == t_field::T_REQUIRED) {
indent(out) << "if self." << field->get_name() << " is None:" << endl;
- indent(out) << " raise TProtocol.TProtocolException(message='Required field " <<
- field->get_name() << " is unset!')" << endl;
+ indent(out) << " raise TProtocol.TProtocolException(message='Required field "
+ << field->get_name() << " is unset!')" << endl;
}
}
}
@@ -1030,29 +934,24 @@ void t_py_generator::generate_py_struct_required_validator(ofstream& out,
* @param tservice The service definition
*/
void t_py_generator::generate_service(t_service* tservice) {
- string f_service_name = package_dir_+"/"+service_name_+".py";
+ string f_service_name = package_dir_ + "/" + service_name_ + ".py";
f_service_.open(f_service_name.c_str());
- f_service_ <<
- py_autogen_comment() << endl <<
- py_imports() << endl;
+ f_service_ << py_autogen_comment() << endl << py_imports() << endl;
if (tservice->get_extends() != NULL) {
- f_service_ <<
- "import " << get_real_py_module(tservice->get_extends()->get_program(), gen_twisted_) <<
- "." << tservice->get_extends()->get_name() << endl;
+ f_service_ << "import "
+ << get_real_py_module(tservice->get_extends()->get_program(), gen_twisted_) << "."
+ << tservice->get_extends()->get_name() << endl;
}
- f_service_ <<
- "from ttypes import *" << endl <<
- "from thrift.Thrift import TProcessor" << endl <<
- render_fastbinary_includes() << endl;
+ f_service_ << "from ttypes import *" << endl << "from thrift.Thrift import TProcessor" << endl
+ << render_fastbinary_includes() << endl;
if (gen_twisted_) {
- f_service_ <<
- "from zope.interface import Interface, implements" << endl <<
- "from twisted.internet import defer" << endl <<
- "from thrift.transport import TTwisted" << endl;
+ f_service_ << "from zope.interface import Interface, implements" << endl
+ << "from twisted.internet import defer" << endl
+ << "from thrift.transport import TTwisted" << endl;
} else if (gen_tornado_) {
f_service_ << "from tornado import gen" << endl;
f_service_ << "from tornado import concurrent" << endl;
@@ -1081,8 +980,7 @@ void t_py_generator::generate_service_helpers(t_service* tservice) {
vector<t_function*> functions = tservice->get_functions();
vector<t_function*>::iterator f_iter;
- f_service_ <<
- "# HELPER FUNCTIONS AND STRUCTURES" << endl;
+ f_service_ << "# HELPER FUNCTIONS AND STRUCTURES" << endl;
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
t_struct* ts = (*f_iter)->get_arglist();
@@ -1133,30 +1031,25 @@ void t_py_generator::generate_service_interface(t_service* tservice) {
}
}
- f_service_ <<
- "class Iface" << extends_if << ":" << endl;
+ f_service_ << "class Iface" << extends_if << ":" << endl;
indent_up();
generate_python_docstring(f_service_, tservice);
vector<t_function*> functions = tservice->get_functions();
if (functions.empty()) {
- f_service_ <<
- indent() << "pass" << endl;
+ f_service_ << indent() << "pass" << endl;
} else {
vector<t_function*>::iterator f_iter;
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- f_service_ <<
- indent() << "def " << function_signature(*f_iter, true) << ":" << endl;
+ f_service_ << indent() << "def " << function_signature(*f_iter, true) << ":" << endl;
indent_up();
generate_python_docstring(f_service_, (*f_iter));
- f_service_ <<
- indent() << "pass" << endl << endl;
+ f_service_ << indent() << "pass" << endl << endl;
indent_down();
}
}
indent_down();
- f_service_ <<
- endl;
+ f_service_ << endl;
}
/**
@@ -1181,96 +1074,76 @@ void t_py_generator::generate_service_client(t_service* tservice) {
}
if (gen_twisted_) {
- f_service_ <<
- "class Client" << extends_client << ":" << endl <<
- " implements(Iface)" << endl << endl;
+ f_service_ << "class Client" << extends_client << ":" << endl << " implements(Iface)" << endl
+ << endl;
} else {
- f_service_ <<
- "class Client(" << extends_client << "Iface):" << endl;
+ f_service_ << "class Client(" << extends_client << "Iface):" << endl;
}
indent_up();
generate_python_docstring(f_service_, tservice);
// Constructor function
if (gen_twisted_) {
- f_service_ <<
- indent() << "def __init__(self, transport, oprot_factory):" << endl;
+ f_service_ << indent() << "def __init__(self, transport, oprot_factory):" << endl;
} else if (gen_tornado_) {
- f_service_ <<
- indent() << "def __init__(self, transport, iprot_factory, oprot_factory=None):" << endl;
+ f_service_ << indent()
+ << "def __init__(self, transport, iprot_factory, oprot_factory=None):" << endl;
} else {
- f_service_ <<
- indent() << "def __init__(self, iprot, oprot=None):" << endl;
+ f_service_ << indent() << "def __init__(self, iprot, oprot=None):" << endl;
}
if (extends.empty()) {
if (gen_twisted_) {
- f_service_ <<
- indent() << " self._transport = transport" << endl <<
- indent() << " self._oprot_factory = oprot_factory" << endl <<
- indent() << " self._seqid = 0" << endl <<
- indent() << " self._reqs = {}" << endl <<
- endl;
+ f_service_ << indent() << " self._transport = transport" << endl << indent()
+ << " self._oprot_factory = oprot_factory" << endl << indent()
+ << " self._seqid = 0" << endl << indent() << " self._reqs = {}" << endl << endl;
} else if (gen_tornado_) {
- f_service_ <<
- indent() << " self._transport = transport" << endl <<
- indent() << " self._iprot_factory = iprot_factory" << endl <<
- indent() << " self._oprot_factory = (oprot_factory if oprot_factory is not None" << endl <<
- indent() << " else iprot_factory)" << endl <<
- indent() << " self._seqid = 0" << endl <<
- indent() << " self._reqs = {}" << endl <<
- indent() << " self._transport.io_loop.spawn_callback(self._start_receiving)" << endl <<
- endl;
+ f_service_ << indent() << " self._transport = transport" << endl << indent()
+ << " self._iprot_factory = iprot_factory" << endl << indent()
+ << " self._oprot_factory = (oprot_factory if oprot_factory is not None" << endl
+ << indent() << " else iprot_factory)" << endl << indent()
+ << " self._seqid = 0" << endl << indent() << " self._reqs = {}" << endl
+ << indent() << " self._transport.io_loop.spawn_callback(self._start_receiving)"
+ << endl << endl;
} else {
- f_service_ <<
- indent() << " self._iprot = self._oprot = iprot" << endl <<
- indent() << " if oprot is not None:" << endl <<
- indent() << " self._oprot = oprot" << endl <<
- indent() << " self._seqid = 0" << endl <<
- endl;
+ f_service_ << indent() << " self._iprot = self._oprot = iprot" << endl << indent()
+ << " if oprot is not None:" << endl << indent() << " self._oprot = oprot"
+ << endl << indent() << " self._seqid = 0" << endl << endl;
}
} else {
if (gen_twisted_) {
- f_service_ <<
- indent() << " " << extends << ".Client.__init__(self, transport, oprot_factory)" << endl <<
- endl;
+ f_service_ << indent() << " " << extends
+ << ".Client.__init__(self, transport, oprot_factory)" << endl << endl;
} else if (gen_tornado_) {
- f_service_ <<
- indent() << " " << extends << ".Client.__init__(self, transport, iprot_factory, oprot_factory)" << endl <<
- endl;
+ f_service_ << indent() << " " << extends
+ << ".Client.__init__(self, transport, iprot_factory, oprot_factory)" << endl
+ << endl;
} else {
- f_service_ <<
- indent() << " " << extends << ".Client.__init__(self, iprot, oprot)" << endl <<
- endl;
+ f_service_ << indent() << " " << extends << ".Client.__init__(self, iprot, oprot)" << endl
+ << endl;
}
}
if (gen_tornado_ && extends.empty()) {
- f_service_ <<
- indent() << "@gen.engine" << endl <<
- indent() << "def _start_receiving(self):" << endl <<
- indent() << " while True:" << endl <<
- indent() << " try:" << endl <<
- indent() << " frame = yield self._transport.readFrame()" << endl <<
- indent() << " except TTransport.TTransportException as e:" << endl <<
- indent() << " for future in self._reqs.itervalues():" << endl <<
- indent() << " future.set_exception(e)" << endl <<
- indent() << " self._reqs = {}" << endl <<
- indent() << " return" << endl <<
- indent() << " tr = TTransport.TMemoryBuffer(frame)" << endl <<
- indent() << " iprot = self._iprot_factory.getProtocol(tr)" << endl <<
- indent() << " (fname, mtype, rseqid) = iprot.readMessageBegin()" << endl <<
- indent() << " future = self._reqs.pop(rseqid, None)" << endl <<
- indent() << " if not future:" << endl <<
- indent() << " # future has already been discarded" << endl <<
- indent() << " continue" << endl <<
- indent() << " method = getattr(self, 'recv_' + fname)" << endl <<
- indent() << " try:" << endl <<
- indent() << " result = method(iprot, mtype, rseqid)" << endl <<
- indent() << " except Exception as e:" << endl <<
- indent() << " future.set_exception(e)" << endl <<
- indent() << " else:" << endl <<
- indent() << " future.set_result(result)" << endl <<
- endl;
+ f_service_ << indent() << "@gen.engine" << endl << indent()
+ << "def _start_receiving(self):" << endl << indent() << " while True:" << endl
+ << indent() << " try:" << endl << indent()
+ << " frame = yield self._transport.readFrame()" << endl << indent()
+ << " except TTransport.TTransportException as e:" << endl << indent()
+ << " for future in self._reqs.itervalues():" << endl << indent()
+ << " future.set_exception(e)" << endl << indent() << " self._reqs = {}"
+ << endl << indent() << " return" << endl << indent()
+ << " tr = TTransport.TMemoryBuffer(frame)" << endl << indent()
+ << " iprot = self._iprot_factory.getProtocol(tr)" << endl << indent()
+ << " (fname, mtype, rseqid) = iprot.readMessageBegin()" << endl << indent()
+ << " future = self._reqs.pop(rseqid, None)" << endl << indent()
+ << " if not future:" << endl << indent()
+ << " # future has already been discarded" << endl << indent()
+ << " continue" << endl << indent()
+ << " method = getattr(self, 'recv_' + fname)" << endl << indent()
+ << " try:" << endl << indent() << " result = method(iprot, mtype, rseqid)"
+ << endl << indent() << " except Exception as e:" << endl << indent()
+ << " future.set_exception(e)" << endl << indent() << " else:" << endl
+ << indent() << " future.set_result(result)" << endl << endl;
}
// Generate client method implementations
@@ -1283,8 +1156,7 @@ void t_py_generator::generate_service_client(t_service* tservice) {
string funname = (*f_iter)->get_name();
// Open function
- indent(f_service_) <<
- "def " << function_signature(*f_iter, false) << ":" << endl;
+ indent(f_service_) << "def " << function_signature(*f_iter, false) << ":" << endl;
indent_up();
generate_python_docstring(f_service_, (*f_iter));
if (gen_twisted_) {
@@ -1295,20 +1167,18 @@ void t_py_generator::generate_service_client(t_service* tservice) {
} else if (gen_tornado_) {
indent(f_service_) << "self._seqid += 1" << endl;
if (!(*f_iter)->is_oneway()) {
- indent(f_service_) <<
- "future = self._reqs[self._seqid] = concurrent.Future()" << endl;
+ indent(f_service_) << "future = self._reqs[self._seqid] = concurrent.Future()" << endl;
}
- indent(f_service_) <<
- "self.send_" << funname << "(";
+ indent(f_service_) << "self.send_" << funname << "(";
} else {
- indent(f_service_) <<
- "self.send_" << funname << "(";
+ indent(f_service_) << "self.send_" << funname << "(";
}
bool first = true;
if (gen_twisted_) {
- // we need a leading comma if there are args, since it's called as maybeDeferred(funcname, arg)
+ // we need a leading comma if there are args, since it's called as maybeDeferred(funcname,
+ // arg)
first = false;
}
for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
@@ -1340,52 +1210,40 @@ void t_py_generator::generate_service_client(t_service* tservice) {
if (gen_twisted_) {
// This block injects the body of the send_<> method for twisted (and a cb/eb pair)
indent_up();
- indent(f_service_) <<
- "d.addCallbacks(" << endl;
+ indent(f_service_) << "d.addCallbacks(" << endl;
indent_up();
- f_service_ <<
- indent() << "callback=self.cb_send_" << funname << "," << endl <<
- indent() << "callbackArgs=(seqid,)," << endl <<
- indent() << "errback=self.eb_send_" << funname << "," << endl <<
- indent() << "errbackArgs=(seqid,))" << endl;
+ f_service_ << indent() << "callback=self.cb_send_" << funname << "," << endl << indent()
+ << "callbackArgs=(seqid,)," << endl << indent() << "errback=self.eb_send_"
+ << funname << "," << endl << indent() << "errbackArgs=(seqid,))" << endl;
indent_down();
- indent(f_service_) <<
- "return d" << endl;
+ indent(f_service_) << "return d" << endl;
indent_down();
f_service_ << endl;
- indent(f_service_) <<
- "def cb_send_" << funname << "(self, _, seqid):" << endl;
+ indent(f_service_) << "def cb_send_" << funname << "(self, _, seqid):" << endl;
indent_up();
if ((*f_iter)->is_oneway()) {
// if one-way, fire the deferred & remove it from _reqs
- f_service_ << indent() <<
- "d = self._reqs.pop(seqid)" << endl << indent() <<
- "d.callback(None)" << endl << indent() <<
- "return d" << endl;
+ f_service_ << indent() << "d = self._reqs.pop(seqid)" << endl << indent()
+ << "d.callback(None)" << endl << indent() << "return d" << endl;
} else {
- f_service_ << indent() <<
- "return self._reqs[seqid]" << endl;
+ f_service_ << indent() << "return self._reqs[seqid]" << endl;
}
indent_down();
f_service_ << endl;
// add an errback to fail the request if the call to send_<> raised an exception
- indent(f_service_) <<
- "def eb_send_" << funname << "(self, f, seqid):" << endl;
+ indent(f_service_) << "def eb_send_" << funname << "(self, f, seqid):" << endl;
indent_up();
- f_service_ <<
- indent() << "d = self._reqs.pop(seqid)" << endl <<
- indent() << "d.errback(f)" << endl <<
- indent() << "return d" << endl;
+ f_service_ << indent() << "d = self._reqs.pop(seqid)" << endl << indent() << "d.errback(f)"
+ << endl << indent() << "return d" << endl;
indent_down();
}
f_service_ << endl;
- indent(f_service_) <<
- "def send_" << function_signature(*f_iter, false) << ":" << endl;
+ indent(f_service_) << "def send_" << function_signature(*f_iter, false) << ":" << endl;
indent_up();
std::string argsname = (*f_iter)->get_name() + "_args";
@@ -1393,35 +1251,29 @@ void t_py_generator::generate_service_client(t_service* tservice) {
// Serialize the request header
if (gen_twisted_ || gen_tornado_) {
- f_service_ <<
- indent() << "oprot = self._oprot_factory.getProtocol(self._transport)" << endl <<
- indent() << "oprot.writeMessageBegin('" << (*f_iter)->get_name() << "', "
+ f_service_ << indent() << "oprot = self._oprot_factory.getProtocol(self._transport)" << endl
+ << indent() << "oprot.writeMessageBegin('" << (*f_iter)->get_name() << "', "
<< messageType << ", self._seqid)" << endl;
} else {
- f_service_ <<
- indent() << "self._oprot.writeMessageBegin('" << (*f_iter)->get_name() << "', "
+ f_service_ << indent() << "self._oprot.writeMessageBegin('" << (*f_iter)->get_name() << "', "
<< messageType << ", self._seqid)" << endl;
}
- f_service_ <<
- indent() << "args = " << argsname << "()" << endl;
+ f_service_ << indent() << "args = " << argsname << "()" << endl;
for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
- f_service_ <<
- indent() << "args." << (*fld_iter)->get_name() << " = " << (*fld_iter)->get_name() << endl;
+ f_service_ << indent() << "args." << (*fld_iter)->get_name() << " = "
+ << (*fld_iter)->get_name() << endl;
}
// Write to the stream
if (gen_twisted_ || gen_tornado_) {
- f_service_ <<
- indent() << "args.write(oprot)" << endl <<
- indent() << "oprot.writeMessageEnd()" << endl <<
- indent() << "oprot.trans.flush()" << endl;
+ f_service_ << indent() << "args.write(oprot)" << endl << indent() << "oprot.writeMessageEnd()"
+ << endl << indent() << "oprot.trans.flush()" << endl;
} else {
- f_service_ <<
- indent() << "args.write(self._oprot)" << endl <<
- indent() << "self._oprot.writeMessageEnd()" << endl <<
- indent() << "self._oprot.trans.flush()" << endl;
+ f_service_ << indent() << "args.write(self._oprot)" << endl << indent()
+ << "self._oprot.writeMessageEnd()" << endl << indent()
+ << "self._oprot.trans.flush()" << endl;
}
indent_down();
@@ -1429,100 +1281,84 @@ void t_py_generator::generate_service_client(t_service* tservice) {
if (!(*f_iter)->is_oneway()) {
std::string resultname = (*f_iter)->get_name() + "_result";
// Open function
- f_service_ <<
- endl;
+ f_service_ << endl;
if (gen_twisted_ || gen_tornado_) {
- f_service_ <<
- indent() << "def recv_" << (*f_iter)->get_name() <<
- "(self, iprot, mtype, rseqid):" << endl;
+ f_service_ << indent() << "def recv_" << (*f_iter)->get_name()
+ << "(self, iprot, mtype, rseqid):" << endl;
} else {
t_struct noargs(program_);
t_function recv_function((*f_iter)->get_returntype(),
- string("recv_") + (*f_iter)->get_name(),
- &noargs);
- f_service_ <<
- indent() << "def " << function_signature(&recv_function) << ":" << endl;
+ string("recv_") + (*f_iter)->get_name(),
+ &noargs);
+ f_service_ << indent() << "def " << function_signature(&recv_function) << ":" << endl;
}
indent_up();
// TODO(mcslee): Validate message reply here, seq ids etc.
if (gen_twisted_) {
- f_service_ <<
- indent() << "d = self._reqs.pop(rseqid)" << endl;
+ f_service_ << indent() << "d = self._reqs.pop(rseqid)" << endl;
} else if (gen_tornado_) {
} else {
- f_service_ <<
- indent() << "iprot = self._iprot" << endl <<
- indent() << "(fname, mtype, rseqid) = iprot.readMessageBegin()" << endl;
+ f_service_ << indent() << "iprot = self._iprot" << endl << indent()
+ << "(fname, mtype, rseqid) = iprot.readMessageBegin()" << endl;
}
- f_service_ <<
- indent() << "if mtype == TMessageType.EXCEPTION:" << endl <<
- indent() << " x = TApplicationException()" << endl;
+ f_service_ << indent() << "if mtype == TMessageType.EXCEPTION:" << endl << indent()
+ << " x = TApplicationException()" << endl;
if (gen_twisted_) {
- f_service_ <<
- indent() << " x.read(iprot)" << endl <<
- indent() << " iprot.readMessageEnd()" << endl <<
- indent() << " return d.errback(x)" << endl <<
- indent() << "result = " << resultname << "()" << endl <<
- indent() << "result.read(iprot)" << endl <<
- indent() << "iprot.readMessageEnd()" << endl;
+ f_service_ << indent() << " x.read(iprot)" << endl << indent()
+ << " iprot.readMessageEnd()" << endl << indent() << " return d.errback(x)"
+ << endl << indent() << "result = " << resultname << "()" << endl << indent()
+ << "result.read(iprot)" << endl << indent() << "iprot.readMessageEnd()" << endl;
} else {
- f_service_ <<
- indent() << " x.read(iprot)" << endl <<
- indent() << " iprot.readMessageEnd()" << endl <<
- indent() << " raise x" << endl <<
- indent() << "result = " << resultname << "()" << endl <<
- indent() << "result.read(iprot)" << endl <<
- indent() << "iprot.readMessageEnd()" << endl;
+ f_service_ << indent() << " x.read(iprot)" << endl << indent()
+ << " iprot.readMessageEnd()" << endl << indent() << " raise x" << endl
+ << indent() << "result = " << resultname << "()" << endl << indent()
+ << "result.read(iprot)" << endl << indent() << "iprot.readMessageEnd()" << endl;
}
// Careful, only return _result if not a void function
if (!(*f_iter)->get_returntype()->is_void()) {
- f_service_ <<
- indent() << "if result.success is not None:" << endl;
- if (gen_twisted_) {
- f_service_ <<
- indent() << " return d.callback(result.success)" << endl;
- } else {
- f_service_ <<
- indent() << " return result.success" << endl;
- }
+ f_service_ << indent() << "if result.success is not None:" << endl;
+ if (gen_twisted_) {
+ f_service_ << indent() << " return d.callback(result.success)" << endl;
+ } else {
+ f_service_ << indent() << " return result.success" << endl;
+ }
}
t_struct* xs = (*f_iter)->get_xceptions();
const std::vector<t_field*>& xceptions = xs->get_members();
vector<t_field*>::const_iterator x_iter;
for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
- f_service_ <<
- indent() << "if result." << (*x_iter)->get_name() << " is not None:" << endl;
- if (gen_twisted_) {
- f_service_ <<
- indent() << " return d.errback(result." << (*x_iter)->get_name() << ")" << endl;
- } else {
- f_service_ <<
- indent() << " raise result." << (*x_iter)->get_name() << "" << endl;
- }
+ f_service_ << indent() << "if result." << (*x_iter)->get_name() << " is not None:" << endl;
+ if (gen_twisted_) {
+ f_service_ << indent() << " return d.errback(result." << (*x_iter)->get_name() << ")"
+ << endl;
+ } else {
+ f_service_ << indent() << " raise result." << (*x_iter)->get_name() << "" << endl;
+ }
}
// Careful, only return _result if not a void function
if ((*f_iter)->get_returntype()->is_void()) {
if (gen_twisted_) {
- f_service_ <<
- indent() << "return d.callback(None)" << endl;
+ f_service_ << indent() << "return d.callback(None)" << endl;
} else {
- f_service_ <<
- indent() << "return" << endl;
+ f_service_ << indent() << "return" << endl;
}
} else {
if (gen_twisted_) {
- f_service_ <<
- indent() << "return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, \"" << (*f_iter)->get_name() << " failed: unknown result\"))" << endl;
+ f_service_
+ << indent()
+ << "return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, \""
+ << (*f_iter)->get_name() << " failed: unknown result\"))" << endl;
} else {
- f_service_ <<
- indent() << "raise TApplicationException(TApplicationException.MISSING_RESULT, \"" << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
+ f_service_ << indent()
+ << "raise TApplicationException(TApplicationException.MISSING_RESULT, \""
+ << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
}
}
@@ -1533,8 +1369,7 @@ void t_py_generator::generate_service_client(t_service* tservice) {
}
indent_down();
- f_service_ <<
- endl;
+ f_service_ << endl;
}
/**
@@ -1544,46 +1379,37 @@ void t_py_generator::generate_service_client(t_service* tservice) {
*/
void t_py_generator::generate_service_remote(t_service* tservice) {
vector<t_function*> functions = tservice->get_functions();
- //Get all function from parents
+ // Get all function from parents
t_service* parent = tservice->get_extends();
- while(parent != NULL) {
+ while (parent != NULL) {
vector<t_function*> p_functions = parent->get_functions();
functions.insert(functions.end(), p_functions.begin(), p_functions.end());
parent = parent->get_extends();
}
vector<t_function*>::iterator f_iter;
- string f_remote_name = package_dir_+"/"+service_name_+"-remote";
+ string f_remote_name = package_dir_ + "/" + service_name_ + "-remote";
ofstream f_remote;
f_remote.open(f_remote_name.c_str());
- f_remote <<
- "#!/usr/bin/env python" << endl <<
- py_autogen_comment() << endl <<
- "import sys" << endl <<
- "import pprint" << endl <<
- "from urlparse import urlparse" << endl <<
- "from thrift.transport import TTransport" << endl <<
- "from thrift.transport import TSocket" << endl <<
- "from thrift.transport import TSSLSocket" << endl <<
- "from thrift.transport import THttpClient" << endl <<
- "from thrift.protocol import TBinaryProtocol" << endl <<
- endl;
-
- f_remote <<
- "from " << module_ << " import " << service_name_ << endl <<
- "from " << module_ << ".ttypes import *" << endl <<
- endl;
-
- f_remote <<
- "if len(sys.argv) <= 1 or sys.argv[1] == '--help':" << endl <<
- " print('')" << endl <<
- " print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]')" << endl <<
- " print('')" << endl <<
- " print('Functions:')" << endl;
+ f_remote << "#!/usr/bin/env python" << endl << py_autogen_comment() << endl << "import sys"
+ << endl << "import pprint" << endl << "from urlparse import urlparse" << endl
+ << "from thrift.transport import TTransport" << endl
+ << "from thrift.transport import TSocket" << endl
+ << "from thrift.transport import TSSLSocket" << endl
+ << "from thrift.transport import THttpClient" << endl
+ << "from thrift.protocol import TBinaryProtocol" << endl << endl;
+
+ f_remote << "from " << module_ << " import " << service_name_ << endl << "from " << module_
+ << ".ttypes import *" << endl << endl;
+
+ f_remote << "if len(sys.argv) <= 1 or sys.argv[1] == '--help':" << endl << " print('')" << endl
+ << " print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] "
+ "function [arg1 [arg2...]]')" << endl << " print('')" << endl
+ << " print('Functions:')" << endl;
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- f_remote <<
- " print(' " << (*f_iter)->get_returntype()->get_name() << " " << (*f_iter)->get_name() << "(";
+ f_remote << " print(' " << (*f_iter)->get_returntype()->get_name() << " "
+ << (*f_iter)->get_name() << "(";
t_struct* arg_struct = (*f_iter)->get_arglist();
const std::vector<t_field*>& args = arg_struct->get_members();
vector<t_field*>::const_iterator a_iter;
@@ -1595,70 +1421,37 @@ void t_py_generator::generate_service_remote(t_service* tservice) {
} else {
f_remote << ", ";
}
- f_remote <<
- args[i]->get_type()->get_name() << " " << args[i]->get_name();
+ f_remote << args[i]->get_type()->get_name() << " " << args[i]->get_name();
}
f_remote << ")')" << endl;
}
- f_remote <<
- " print('')" << endl <<
- " sys.exit(0)" << endl <<
- endl;
-
- f_remote <<
- "pp = pprint.PrettyPrinter(indent = 2)" << endl <<
- "host = 'localhost'" << endl <<
- "port = 9090" << endl <<
- "uri = ''" << endl <<
- "framed = False" << endl <<
- "ssl = False" << endl <<
- "http = False" << endl <<
- "argi = 1" << endl <<
- endl <<
- "if sys.argv[argi] == '-h':" << endl <<
- " parts = sys.argv[argi+1].split(':')" << endl <<
- " host = parts[0]" << endl <<
- " if len(parts) > 1:" << endl <<
- " port = int(parts[1])" << endl <<
- " argi += 2" << endl <<
- endl <<
- "if sys.argv[argi] == '-u':" << endl <<
- " url = urlparse(sys.argv[argi+1])" << endl <<
- " parts = url[1].split(':')" << endl <<
- " host = parts[0]" << endl <<
- " if len(parts) > 1:" << endl <<
- " port = int(parts[1])" << endl <<
- " else:" << endl <<
- " port = 80" << endl <<
- " uri = url[2]" << endl <<
- " if url[4]:" << endl <<
- " uri += '?%s' % url[4]" << endl <<
- " http = True" << endl <<
- " argi += 2" << endl <<
- endl <<
- "if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':" << endl <<
- " framed = True" << endl <<
- " argi += 1" << endl <<
- endl <<
- "if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':" << endl <<
- " ssl = True" << endl <<
- " argi += 1" << endl <<
- endl <<
- "cmd = sys.argv[argi]" << endl <<
- "args = sys.argv[argi+1:]" << endl <<
- endl <<
- "if http:" << endl <<
- " transport = THttpClient.THttpClient(host, port, uri)" << endl <<
- "else:" << endl <<
- " socket = TSSLSocket.TSSLSocket(host, port, validate=False) if ssl else TSocket.TSocket(host, port)" << endl <<
- " if framed:" << endl <<
- " transport = TTransport.TFramedTransport(socket)" << endl <<
- " else:" << endl <<
- " transport = TTransport.TBufferedTransport(socket)" << endl <<
- "protocol = TBinaryProtocol.TBinaryProtocol(transport)" << endl <<
- "client = " << service_name_ << ".Client(protocol)" << endl <<
- "transport.open()" << endl <<
- endl;
+ f_remote << " print('')" << endl << " sys.exit(0)" << endl << endl;
+
+ f_remote << "pp = pprint.PrettyPrinter(indent = 2)" << endl << "host = 'localhost'" << endl
+ << "port = 9090" << endl << "uri = ''" << endl << "framed = False" << endl
+ << "ssl = False" << endl << "http = False" << endl << "argi = 1" << endl << endl
+ << "if sys.argv[argi] == '-h':" << endl << " parts = sys.argv[argi+1].split(':')"
+ << endl << " host = parts[0]" << endl << " if len(parts) > 1:" << endl
+ << " port = int(parts[1])" << endl << " argi += 2" << endl << endl
+ << "if sys.argv[argi] == '-u':" << endl << " url = urlparse(sys.argv[argi+1])" << endl
+ << " parts = url[1].split(':')" << endl << " host = parts[0]" << endl
+ << " if len(parts) > 1:" << endl << " port = int(parts[1])" << endl
+ << " else:" << endl << " port = 80" << endl << " uri = url[2]" << endl
+ << " if url[4]:" << endl << " uri += '?%s' % url[4]" << endl << " http = True"
+ << endl << " argi += 2" << endl << endl
+ << "if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':" << endl
+ << " framed = True" << endl << " argi += 1" << endl << endl
+ << "if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':" << endl << " ssl = True"
+ << endl << " argi += 1" << endl << endl << "cmd = sys.argv[argi]" << endl
+ << "args = sys.argv[argi+1:]" << endl << endl << "if http:" << endl
+ << " transport = THttpClient.THttpClient(host, port, uri)" << endl << "else:" << endl
+ << " socket = TSSLSocket.TSSLSocket(host, port, validate=False) if ssl else "
+ "TSocket.TSocket(host, port)" << endl << " if framed:" << endl
+ << " transport = TTransport.TFramedTransport(socket)" << endl << " else:" << endl
+ << " transport = TTransport.TBufferedTransport(socket)" << endl
+ << "protocol = TBinaryProtocol.TBinaryProtocol(transport)" << endl
+ << "client = " << service_name_ << ".Client(protocol)" << endl << "transport.open()"
+ << endl << endl;
// Generate the dispatch methods
bool first = true;
@@ -1675,12 +1468,10 @@ void t_py_generator::generate_service_remote(t_service* tservice) {
vector<t_field*>::const_iterator a_iter;
int num_args = args.size();
- f_remote <<
- "if cmd == '" << (*f_iter)->get_name() << "':" << endl <<
- " if len(args) != " << num_args << ":" << endl <<
- " print('" << (*f_iter)->get_name() << " requires " << num_args << " args')" << endl <<
- " sys.exit(1)" << endl <<
- " pp.pprint(client." << (*f_iter)->get_name() << "(";
+ f_remote << "if cmd == '" << (*f_iter)->get_name() << "':" << endl
+ << " if len(args) != " << num_args << ":" << endl << " print('"
+ << (*f_iter)->get_name() << " requires " << num_args << " args')" << endl
+ << " sys.exit(1)" << endl << " pp.pprint(client." << (*f_iter)->get_name() << "(";
for (int i = 0; i < num_args; ++i) {
if (args[i]->get_type()->is_string()) {
f_remote << "args[" << i << "],";
@@ -1709,16 +1500,11 @@ void t_py_generator::generate_service_remote(t_service* tservice) {
// Make file executable, love that bitwise OR action
chmod(f_remote_name.c_str(),
- S_IRUSR
- | S_IWUSR
- | S_IXUSR
+ S_IRUSR | S_IWUSR | S_IXUSR
#ifndef _WIN32
- | S_IRGRP
- | S_IXGRP
- | S_IROTH
- | S_IXOTH
+ | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH
#endif
- );
+ );
#endif // _MSC_VER
}
@@ -1742,88 +1528,71 @@ void t_py_generator::generate_service_server(t_service* tservice) {
// Generate the header portion
if (gen_twisted_) {
- f_service_ <<
- "class Processor(" << extends_processor << "TProcessor):" << endl <<
- " implements(Iface)" << endl << endl;
+ f_service_ << "class Processor(" << extends_processor << "TProcessor):" << endl
+ << " implements(Iface)" << endl << endl;
} else {
- f_service_ <<
- "class Processor(" << extends_processor << "Iface, TProcessor):" << endl;
+ f_service_ << "class Processor(" << extends_processor << "Iface, TProcessor):" << endl;
}
indent_up();
- indent(f_service_) <<
- "def __init__(self, handler):" << endl;
+ indent(f_service_) << "def __init__(self, handler):" << endl;
indent_up();
if (extends.empty()) {
if (gen_twisted_) {
- f_service_ <<
- indent() << "self._handler = Iface(handler)" << endl;
+ f_service_ << indent() << "self._handler = Iface(handler)" << endl;
} else {
- f_service_ <<
- indent() << "self._handler = handler" << endl;
+ f_service_ << indent() << "self._handler = handler" << endl;
}
- f_service_ <<
- indent() << "self._processMap = {}" << endl;
+ f_service_ << indent() << "self._processMap = {}" << endl;
} else {
if (gen_twisted_) {
- f_service_ <<
- indent() << extends << ".Processor.__init__(self, Iface(handler))" << endl;
+ f_service_ << indent() << extends << ".Processor.__init__(self, Iface(handler))" << endl;
} else {
- f_service_ <<
- indent() << extends << ".Processor.__init__(self, handler)" << endl;
+ f_service_ << indent() << extends << ".Processor.__init__(self, handler)" << endl;
}
}
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- f_service_ <<
- indent() << "self._processMap[\"" << (*f_iter)->get_name() << "\"] = Processor.process_" << (*f_iter)->get_name() << endl;
+ f_service_ << indent() << "self._processMap[\"" << (*f_iter)->get_name()
+ << "\"] = Processor.process_" << (*f_iter)->get_name() << endl;
}
indent_down();
f_service_ << endl;
// Generate the server implementation
- f_service_ <<
- indent() << "def process(self, iprot, oprot):" << endl;
+ f_service_ << indent() << "def process(self, iprot, oprot):" << endl;
indent_up();
- f_service_ <<
- indent() << "(name, type, seqid) = iprot.readMessageBegin()" << endl;
+ f_service_ << indent() << "(name, type, seqid) = iprot.readMessageBegin()" << endl;
// TODO(mcslee): validate message
// HOT: dictionary function lookup
- f_service_ <<
- indent() << "if name not in self._processMap:" << endl <<
- indent() << " iprot.skip(TType.STRUCT)" << endl <<
- indent() << " iprot.readMessageEnd()" << endl <<
- indent() << " x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))" << endl <<
- indent() << " oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)" << endl <<
- indent() << " x.write(oprot)" << endl <<
- indent() << " oprot.writeMessageEnd()" << endl <<
- indent() << " oprot.trans.flush()" << endl;
+ f_service_ << indent() << "if name not in self._processMap:" << endl << indent()
+ << " iprot.skip(TType.STRUCT)" << endl << indent() << " iprot.readMessageEnd()"
+ << endl << indent()
+ << " x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown "
+ "function %s' % (name))" << endl << indent()
+ << " oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)" << endl << indent()
+ << " x.write(oprot)" << endl << indent() << " oprot.writeMessageEnd()" << endl
+ << indent() << " oprot.trans.flush()" << endl;
if (gen_twisted_) {
- f_service_ <<
- indent() << " return defer.succeed(None)" << endl;
+ f_service_ << indent() << " return defer.succeed(None)" << endl;
} else {
- f_service_ <<
- indent() << " return" << endl;
+ f_service_ << indent() << " return" << endl;
}
- f_service_ <<
- indent() << "else:" << endl;
+ f_service_ << indent() << "else:" << endl;
if (gen_twisted_ || gen_tornado_) {
- f_service_ <<
- indent() << " return self._processMap[name](self, seqid, iprot, oprot)" << endl;
+ f_service_ << indent() << " return self._processMap[name](self, seqid, iprot, oprot)" << endl;
} else {
- f_service_ <<
- indent() << " self._processMap[name](self, seqid, iprot, oprot)" << endl;
+ f_service_ << indent() << " self._processMap[name](self, seqid, iprot, oprot)" << endl;
// Read end of args field, the T_STOP, and the struct close
- f_service_ <<
- indent() << "return True" << endl;
+ f_service_ << indent() << "return True" << endl;
}
indent_down();
@@ -1843,19 +1612,15 @@ void t_py_generator::generate_service_server(t_service* tservice) {
*
* @param tfunction The function to write a dispatcher for
*/
-void t_py_generator::generate_process_function(t_service* tservice,
- t_function* tfunction) {
- (void) tservice;
+void t_py_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
+ (void)tservice;
// Open function
if (gen_tornado_) {
- f_service_ <<
- indent() << "@gen.coroutine" << endl <<
- indent() << "def process_" << tfunction->get_name() <<
- "(self, seqid, iprot, oprot):" << endl;
+ f_service_ << indent() << "@gen.coroutine" << endl << indent() << "def process_"
+ << tfunction->get_name() << "(self, seqid, iprot, oprot):" << endl;
} else {
- f_service_ <<
- indent() << "def process_" << tfunction->get_name() <<
- "(self, seqid, iprot, oprot):" << endl;
+ f_service_ << indent() << "def process_" << tfunction->get_name()
+ << "(self, seqid, iprot, oprot):" << endl;
}
indent_up();
@@ -1863,10 +1628,8 @@ void t_py_generator::generate_process_function(t_service* tservice,
string argsname = tfunction->get_name() + "_args";
string resultname = tfunction->get_name() + "_result";
- f_service_ <<
- indent() << "args = " << argsname << "()" << endl <<
- indent() << "args.read(iprot)" << endl <<
- indent() << "iprot.readMessageEnd()" << endl;
+ f_service_ << indent() << "args = " << argsname << "()" << endl << indent() << "args.read(iprot)"
+ << endl << indent() << "iprot.readMessageEnd()" << endl;
t_struct* xs = tfunction->get_xceptions();
const std::vector<t_field*>& xceptions = xs->get_members();
@@ -1874,8 +1637,7 @@ void t_py_generator::generate_process_function(t_service* tservice,
// Declare result for non oneway function
if (!tfunction->is_oneway()) {
- f_service_ <<
- indent() << "result = " << resultname << "()" << endl;
+ f_service_ << indent() << "result = " << resultname << "()" << endl;
}
if (gen_twisted_) {
@@ -1884,9 +1646,8 @@ void t_py_generator::generate_process_function(t_service* tservice,
const std::vector<t_field*>& fields = arg_struct->get_members();
vector<t_field*>::const_iterator f_iter;
- f_service_ <<
- indent() << "d = defer.maybeDeferred(self._handler." <<
- tfunction->get_name() << ", ";
+ f_service_ << indent() << "d = defer.maybeDeferred(self._handler." << tfunction->get_name()
+ << ", ";
bool first = true;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
if (first) {
@@ -1900,76 +1661,61 @@ void t_py_generator::generate_process_function(t_service* tservice,
// Shortcut out here for oneway functions
if (tfunction->is_oneway()) {
- f_service_ <<
- indent() << "return d" << endl;
+ f_service_ << indent() << "return d" << endl;
indent_down();
f_service_ << endl;
return;
}
- f_service_ <<
- indent() <<
- "d.addCallback(self.write_results_success_" <<
- tfunction->get_name() << ", result, seqid, oprot)" << endl;
+ f_service_ << indent() << "d.addCallback(self.write_results_success_" << tfunction->get_name()
+ << ", result, seqid, oprot)" << endl;
if (xceptions.size() > 0) {
- f_service_ <<
- indent() <<
- "d.addErrback(self.write_results_exception_" <<
- tfunction->get_name() << ", result, seqid, oprot)" << endl;
+ f_service_ << indent() << "d.addErrback(self.write_results_exception_"
+ << tfunction->get_name() << ", result, seqid, oprot)" << endl;
}
- f_service_ <<
- indent() << "return d" << endl;
+ f_service_ << indent() << "return d" << endl;
indent_down();
f_service_ << endl;
- indent(f_service_) <<
- "def write_results_success_" << tfunction->get_name() <<
- "(self, success, result, seqid, oprot):" << endl;
+ indent(f_service_) << "def write_results_success_" << tfunction->get_name()
+ << "(self, success, result, seqid, oprot):" << endl;
indent_up();
- f_service_ <<
- indent() << "result.success = success" << endl <<
- indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name() <<
- "\", TMessageType.REPLY, seqid)" << endl <<
- indent() << "result.write(oprot)" << endl <<
- indent() << "oprot.writeMessageEnd()" << endl <<
- indent() << "oprot.trans.flush()" << endl;
+ f_service_ << indent() << "result.success = success" << endl << indent()
+ << "oprot.writeMessageBegin(\"" << tfunction->get_name()
+ << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
+ << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
+ << "oprot.trans.flush()" << endl;
indent_down();
f_service_ << endl;
// Try block for a function with exceptions
if (!tfunction->is_oneway() && xceptions.size() > 0) {
- indent(f_service_) <<
- "def write_results_exception_" << tfunction->get_name() <<
- "(self, error, result, seqid, oprot):" << endl;
+ indent(f_service_) << "def write_results_exception_" << tfunction->get_name()
+ << "(self, error, result, seqid, oprot):" << endl;
indent_up();
- f_service_ <<
- indent() << "try:" << endl;
+ f_service_ << indent() << "try:" << endl;
// Kinda absurd
- f_service_ <<
- indent() << " error.raiseException()" << endl;
+ 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()) << ", " << (*x_iter)->get_name() << ":" << endl;
+ f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << ", "
+ << (*x_iter)->get_name() << ":" << endl;
if (!tfunction->is_oneway()) {
indent_up();
- f_service_ <<
- indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name() << endl;
+ f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
+ << (*x_iter)->get_name() << endl;
indent_down();
} else {
- f_service_ <<
- indent() << "pass" << endl;
+ f_service_ << indent() << "pass" << endl;
}
}
- f_service_ <<
- indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name() <<
- "\", TMessageType.REPLY, seqid)" << endl <<
- indent() << "result.write(oprot)" << endl <<
- indent() << "oprot.writeMessageEnd()" << endl <<
- indent() << "oprot.trans.flush()" << endl;
+ f_service_ << indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name()
+ << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
+ << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
+ << "oprot.trans.flush()" << endl;
indent_down();
f_service_ << endl;
}
@@ -2005,16 +1751,14 @@ void t_py_generator::generate_process_function(t_service* tservice,
vector<t_field*>::const_iterator f_iter;
if (xceptions.size() > 0) {
- f_service_ <<
- indent() << "try:" << endl;
+ f_service_ << indent() << "try:" << endl;
indent_up();
}
f_service_ << indent();
if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
f_service_ << "result.success = ";
}
- f_service_ <<
- "yield gen.maybe_future(self._handler." << tfunction->get_name() << "(";
+ f_service_ << "yield gen.maybe_future(self._handler." << tfunction->get_name() << "(";
bool first = true;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
if (first) {
@@ -2029,37 +1773,34 @@ void t_py_generator::generate_process_function(t_service* tservice,
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()) << ", " << (*x_iter)->get_name() << ":" << endl;
+ f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << ", "
+ << (*x_iter)->get_name() << ":" << endl;
if (!tfunction->is_oneway()) {
indent_up();
- f_service_ <<
- indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name() << endl;
+ f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
+ << (*x_iter)->get_name() << endl;
indent_down();
} else {
- f_service_ <<
- indent() << "pass" << endl;
+ f_service_ << indent() << "pass" << endl;
}
}
}
if (!tfunction->is_oneway()) {
- f_service_ <<
- indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name() << "\", TMessageType.REPLY, seqid)" << endl <<
- indent() << "result.write(oprot)" << endl <<
- indent() << "oprot.writeMessageEnd()" << endl <<
- indent() << "oprot.trans.flush()" << endl;
+ f_service_ << indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name()
+ << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
+ << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
+ << "oprot.trans.flush()" << endl;
}
// Close function
indent_down();
f_service_ << endl;
- } else { // py
+ } else { // py
// Try block for a function with exceptions
if (xceptions.size() > 0) {
- f_service_ <<
- indent() << "try:" << endl;
+ f_service_ << indent() << "try:" << endl;
indent_up();
}
@@ -2072,8 +1813,7 @@ void t_py_generator::generate_process_function(t_service* tservice,
if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
f_service_ << "result.success = ";
}
- f_service_ <<
- "self._handler." << tfunction->get_name() << "(";
+ f_service_ << "self._handler." << tfunction->get_name() << "(";
bool first = true;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
if (first) {
@@ -2088,34 +1828,31 @@ void t_py_generator::generate_process_function(t_service* tservice,
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()) << ", " << (*x_iter)->get_name() << ":" << endl;
+ f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << ", "
+ << (*x_iter)->get_name() << ":" << endl;
if (!tfunction->is_oneway()) {
indent_up();
- f_service_ <<
- indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name() << endl;
+ f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
+ << (*x_iter)->get_name() << endl;
indent_down();
} else {
- f_service_ <<
- indent() << "pass" << endl;
+ f_service_ << indent() << "pass" << endl;
}
}
}
// Shortcut out here for oneway functions
if (tfunction->is_oneway()) {
- f_service_ <<
- indent() << "return" << endl;
+ f_service_ << indent() << "return" << endl;
indent_down();
f_service_ << endl;
return;
}
- f_service_ <<
- indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name() << "\", TMessageType.REPLY, seqid)" << endl <<
- indent() << "result.write(oprot)" << endl <<
- indent() << "oprot.writeMessageEnd()" << endl <<
- indent() << "oprot.trans.flush()" << endl;
+ f_service_ << indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name()
+ << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
+ << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
+ << "oprot.trans.flush()" << endl;
// Close function
indent_down();
@@ -2126,36 +1863,31 @@ void t_py_generator::generate_process_function(t_service* tservice,
/**
* Deserializes a field of any type.
*/
-void t_py_generator::generate_deserialize_field(ofstream &out,
+void t_py_generator::generate_deserialize_field(ofstream& out,
t_field* tfield,
string prefix,
bool inclass) {
- (void) inclass;
+ (void)inclass;
t_type* type = get_true_type(tfield->get_type());
if (type->is_void()) {
- throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " +
- prefix + tfield->get_name();
+ throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
}
string name = prefix + tfield->get_name();
if (type->is_struct() || type->is_xception()) {
- generate_deserialize_struct(out,
- (t_struct*)type,
- name);
+ generate_deserialize_struct(out, (t_struct*)type, name);
} else if (type->is_container()) {
generate_deserialize_container(out, type, name);
} else if (type->is_base_type() || type->is_enum()) {
- indent(out) <<
- name << " = iprot.";
+ indent(out) << name << " = iprot.";
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
case t_base_type::TYPE_VOID:
- throw "compiler error: cannot serialize void field in a struct: " +
- name;
+ throw "compiler error: cannot serialize void field in a struct: " + name;
break;
case t_base_type::TYPE_STRING:
if (((t_base_type*)type)->is_binary() || !gen_utf8strings_) {
@@ -2192,28 +1924,24 @@ void t_py_generator::generate_deserialize_field(ofstream &out,
} else {
printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
- tfield->get_name().c_str(), type->get_name().c_str());
+ tfield->get_name().c_str(),
+ type->get_name().c_str());
}
}
/**
* Generates an unserializer for a struct, calling read()
*/
-void t_py_generator::generate_deserialize_struct(ofstream &out,
- t_struct* tstruct,
- string prefix) {
- out <<
- indent() << prefix << " = " << type_name(tstruct) << "()" << endl <<
- indent() << prefix << ".read(iprot)" << endl;
+void t_py_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
+ out << indent() << prefix << " = " << type_name(tstruct) << "()" << endl << indent() << prefix
+ << ".read(iprot)" << endl;
}
/**
* Serialize a container by writing out the header followed by
* data and then a footer.
*/
-void t_py_generator::generate_deserialize_container(ofstream &out,
- t_type* ttype,
- string prefix) {
+void t_py_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
string size = tmp("_size");
string ktype = tmp("_ktype");
string vtype = tmp("_vtype");
@@ -2226,35 +1954,31 @@ void t_py_generator::generate_deserialize_container(ofstream &out,
// Declare variables, read header
if (ttype->is_map()) {
- out <<
- indent() << prefix << " = {}" << endl <<
- indent() << "(" << ktype << ", " << vtype << ", " << size << " ) = iprot.readMapBegin()" << endl;
+ out << indent() << prefix << " = {}" << endl << indent() << "(" << ktype << ", " << vtype
+ << ", " << size << " ) = iprot.readMapBegin()" << endl;
} else if (ttype->is_set()) {
- out <<
- indent() << prefix << " = set()" << endl <<
- indent() << "(" << etype << ", " << size << ") = iprot.readSetBegin()" << endl;
+ out << indent() << prefix << " = set()" << endl << indent() << "(" << etype << ", " << size
+ << ")
<TRUNCATED>