Repository: thrift Updated Branches: refs/heads/master 6dde7f192 -> 269473d47
THRIFT-3438 Enable py:new_style by default Client: Python Patch: Nobuaki Sukegawa This closes #759 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/b78d781b Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/b78d781b Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/b78d781b Branch: refs/heads/master Commit: b78d781b2e55a066d53577402e42b4d509998978 Parents: b9c859a Author: Nobuaki Sukegawa <[email protected]> Authored: Thu Dec 24 00:01:26 2015 +0900 Committer: Nobuaki Sukegawa <[email protected]> Committed: Sat Jan 2 22:54:16 2016 +0900 ---------------------------------------------------------------------- compiler/cpp/src/generate/t_py_generator.cc | 16 +++++++++++++--- test/py/Makefile.am | 22 +++++++++++----------- test/py/RunClientServer.py | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/b78d781b/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 81e4643..00be6e7 100644 --- a/compiler/cpp/src/generate/t_py_generator.cc +++ b/compiler/cpp/src/generate/t_py_generator.cc @@ -54,7 +54,16 @@ public: std::map<std::string, std::string>::const_iterator iter; iter = parsed_options.find("new_style"); - gen_newstyle_ = (iter != parsed_options.end()); + if (iter != parsed_options.end()) { + pwarning(0, "new_style is enabled by default, so the option will be removed in the near future.\n"); + } + + gen_newstyle_ = true; + iter = parsed_options.find("old_style"); + if (iter != parsed_options.end()) { + gen_newstyle_ = false; + pwarning(0, "old_style is deprecated and may be removed in the future.\n"); + } iter = parsed_options.find("slots"); gen_slots_ = (iter != parsed_options.end()); @@ -63,7 +72,7 @@ public: gen_dynamic_ = (iter != parsed_options.end()); if (gen_dynamic_) { - gen_newstyle_ = 0; // dynamic is newstyle + gen_newstyle_ = false; // dynamic is newstyle gen_dynbaseclass_ = "TBase"; gen_dynbaseclass_frozen_ = "TFrozenBase"; gen_dynbaseclass_exc_ = "TExceptionBase"; @@ -2574,7 +2583,8 @@ string t_py_generator::type_to_spec_args(t_type* ttype) { THRIFT_REGISTER_GENERATOR( py, "Python", - " new_style: Generate new-style classes.\n" + " new_style: No effect. Kept for backward compatibility.\n" + " old_style: Deprecated. Generate old-style classes.\n" " twisted: Generate Twisted-friendly RPC services.\n" " tornado: Generate code for use with Tornado.\n" " utf8strings: Encode/decode strings using utf8 in the generated code.\n" http://git-wip-us.apache.org/repos/asf/thrift/blob/b78d781b/test/py/Makefile.am ---------------------------------------------------------------------- diff --git a/test/py/Makefile.am b/test/py/Makefile.am index 1f710f1..d1d2278 100755 --- a/test/py/Makefile.am +++ b/test/py/Makefile.am @@ -29,10 +29,10 @@ thrift_gen = \ gen-py-default/DebugProtoTest/__init__.py \ gen-py-slots/ThriftTest/__init__.py \ gen-py-slots/DebugProtoTest/__init__.py \ - gen-py-newstyle/ThriftTest/__init__.py \ - gen-py-newstyle/DebugProtoTest/__init__.py \ - gen-py-newstyleslots/ThriftTest/__init__.py \ - gen-py-newstyleslots/DebugProtoTest/__init__.py \ + gen-py-oldstyle/ThriftTest/__init__.py \ + gen-py-oldstyle/DebugProtoTest/__init__.py \ + gen-py-oldstyleslots/ThriftTest/__init__.py \ + gen-py-oldstyleslots/DebugProtoTest/__init__.py \ gen-py-dynamic/ThriftTest/__init__.py \ gen-py-dynamic/DebugProtoTest/__init__.py \ gen-py-dynamicslots/ThriftTest/__init__.py \ @@ -64,13 +64,13 @@ gen-py-slots/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-slots || $(MKDIR_P) gen-py-slots $(THRIFT) --gen py:slots -out gen-py-slots $< -gen-py-newstyle/%/__init__.py: ../%.thrift $(THRIFT) - test -d gen-py-newstyle || $(MKDIR_P) gen-py-newstyle - $(THRIFT) --gen py:new_style -out gen-py-newstyle $< +gen-py-oldstyle/%/__init__.py: ../%.thrift $(THRIFT) + test -d gen-py-oldstyle || $(MKDIR_P) gen-py-oldstyle + $(THRIFT) --gen py:old_style -out gen-py-oldstyle $< -gen-py-newstyleslots/%/__init__.py: ../%.thrift $(THRIFT) - test -d gen-py-newstyleslots || $(MKDIR_P) gen-py-newstyleslots - $(THRIFT) --gen py:new_style,slots -out gen-py-newstyleslots $< +gen-py-oldstyleslots/%/__init__.py: ../%.thrift $(THRIFT) + test -d gen-py-oldstyleslots || $(MKDIR_P) gen-py-oldstyleslots + $(THRIFT) --gen py:old_style,slots -out gen-py-oldstyleslots $< gen-py-dynamic/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-dynamic || $(MKDIR_P) gen-py-dynamic @@ -81,4 +81,4 @@ gen-py-dynamicslots/%/__init__.py: ../%.thrift $(THRIFT) $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $< clean-local: - $(RM) -r gen-py gen-py-slots gen-py-default gen-py-newstyle gen-py-newstyleslots gen-py-dynamic gen-py-dynamicslots + $(RM) -r gen-py gen-py-slots gen-py-default gen-py-oldstyle gen-py-oldstyleslots gen-py-dynamic gen-py-dynamicslots http://git-wip-us.apache.org/repos/asf/thrift/blob/b78d781b/test/py/RunClientServer.py ---------------------------------------------------------------------- diff --git a/test/py/RunClientServer.py b/test/py/RunClientServer.py index f83f557..8a7ead5 100755 --- a/test/py/RunClientServer.py +++ b/test/py/RunClientServer.py @@ -250,7 +250,7 @@ def main(): parser = OptionParser() parser.add_option('--all', action="store_true", dest='all') parser.add_option('--genpydirs', type='string', dest='genpydirs', - default='default,slots,newstyle,newstyleslots,dynamic,dynamicslots', + default='default,slots,oldstyle,dynamic,dynamicslots', help='directory extensions for generated code, used as suffixes for \"gen-py-*\" added sys.path for individual tests') parser.add_option("--port", type="int", dest="port", default=9090, help="port number for server to listen on")
