diff --git a/protoc-plugin/plugin_pb2.py b/protoc-plugin/plugin_pb2.py deleted file mode 100644 index 71b6c3b..0000000 --- a/protoc-plugin/plugin_pb2.py +++ /dev/null @@ -1,159 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! - -from google.protobuf import descriptor -from google.protobuf import message -from google.protobuf import reflection -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) - - -DESCRIPTOR = descriptor.FileDescriptor( - name='google/protobuf/compiler/plugin.proto', - package='google.protobuf.compiler', - serialized_pb='\n%google/protobuf/compiler/plugin.proto\x12\x18google.protobuf.compiler\x1a google/protobuf/descriptor.proto\"}\n\x14\x43odeGeneratorRequest\x12\x18\n\x10\x66ile_to_generate\x18\x01 \x03(\t\x12\x11\n\tparameter\x18\x02 \x01(\t\x12\x38\n\nproto_file\x18\x0f \x03(\x0b\x32$.google.protobuf.FileDescriptorProto\"\xaa\x01\n\x15\x43odeGeneratorResponse\x12\r\n\x05\x65rror\x18\x01 \x01(\t\x12\x42\n\x04\x66ile\x18\x0f \x03(\x0b\x32\x34.google.protobuf.compiler.CodeGeneratorResponse.File\x1a>\n\x04\x46ile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x17\n\x0finsertion_point\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x0f \x01(\t') - - - - -_CODEGENERATORREQUEST = descriptor.Descriptor( - name='CodeGeneratorRequest', - full_name='google.protobuf.compiler.CodeGeneratorRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - descriptor.FieldDescriptor( - name='file_to_generate', full_name='google.protobuf.compiler.CodeGeneratorRequest.file_to_generate', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='parameter', full_name='google.protobuf.compiler.CodeGeneratorRequest.parameter', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='proto_file', full_name='google.protobuf.compiler.CodeGeneratorRequest.proto_file', index=2, - number=15, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=101, - serialized_end=226, -) - - -_CODEGENERATORRESPONSE_FILE = descriptor.Descriptor( - name='File', - full_name='google.protobuf.compiler.CodeGeneratorResponse.File', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - descriptor.FieldDescriptor( - name='name', full_name='google.protobuf.compiler.CodeGeneratorResponse.File.name', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='insertion_point', full_name='google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='content', full_name='google.protobuf.compiler.CodeGeneratorResponse.File.content', index=2, - number=15, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=337, - serialized_end=399, -) - -_CODEGENERATORRESPONSE = descriptor.Descriptor( - name='CodeGeneratorResponse', - full_name='google.protobuf.compiler.CodeGeneratorResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - descriptor.FieldDescriptor( - name='error', full_name='google.protobuf.compiler.CodeGeneratorResponse.error', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='file', full_name='google.protobuf.compiler.CodeGeneratorResponse.file', index=1, - number=15, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[_CODEGENERATORRESPONSE_FILE, ], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=229, - serialized_end=399, -) - -import google.protobuf.descriptor_pb2 - -_CODEGENERATORREQUEST.fields_by_name['proto_file'].message_type = google.protobuf.descriptor_pb2._FILEDESCRIPTORPROTO -_CODEGENERATORRESPONSE_FILE.containing_type = _CODEGENERATORRESPONSE; -_CODEGENERATORRESPONSE.fields_by_name['file'].message_type = _CODEGENERATORRESPONSE_FILE - -class CodeGeneratorRequest(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CODEGENERATORREQUEST - - # @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorRequest) - -class CodeGeneratorResponse(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - - class File(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CODEGENERATORRESPONSE_FILE - - # @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorResponse.File) - DESCRIPTOR = _CODEGENERATORRESPONSE - - # @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorResponse) - -# @@protoc_insertion_point(module_scope) diff --git a/protoc-plugin/protoc-gen-lua b/protoc-plugin/protoc-gen-lua index b9bdeb3..174723c 100755 --- a/protoc-plugin/protoc-gen-lua +++ b/protoc-plugin/protoc-gen-lua @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-*- coding: utf-8 -*- # # Google's Protocol Buffers project, ported to lua. @@ -12,16 +12,16 @@ import sys import os.path as path -from cStringIO import StringIO +from io import StringIO -import plugin_pb2 +import google.protobuf.compiler.plugin_pb2 as plugin_pb2 import google.protobuf.descriptor_pb2 as descriptor_pb2 _packages = {} _files = {} _message = {} -FDP = plugin_pb2.descriptor_pb2.FieldDescriptorProto +FDP = descriptor_pb2.FieldDescriptorProto if sys.platform == 'win32': import msvcrt, os @@ -416,14 +416,18 @@ def code_gen_file(proto_file, env, is_gen): lua('local %s_pb = require \'%s_pb\')\n' % (i, i)) lua('\n') - map(lua, env.descriptor) + for item in env.descriptor: + lua(item) lua('\n') - map(lua, env.context) + for item in env.context: + lua(item) lua('\n') env.message.sort() - map(lua, env.message) + for item in env.message: + lua(item) lua('\n') - map(lua, env.register) + for item in env.register: + lua(item) lua('\n') lua('module.MESSAGE_TYPES = {'+','.join('\''+x.name+'\'' for x in proto_file.message_type)+'}\n') lua('module.ENUM_TYPES = {'+','.join('\''+x.name+'\'' for x in proto_file.enum_type)+'}\n') @@ -435,7 +439,7 @@ def code_gen_file(proto_file, env, is_gen): env.exit_file() def main(): - plugin_require_bin = sys.stdin.read() + plugin_require_bin = sys.stdin.buffer.read() code_gen_req = plugin_pb2.CodeGeneratorRequest() code_gen_req.ParseFromString(plugin_require_bin) @@ -450,7 +454,7 @@ def main(): file_desc.name = k file_desc.content = _files[k] - sys.stdout.write(code_generated.SerializeToString()) + sys.stdout.buffer.write(code_generated.SerializeToString()) if __name__ == '__main__': main()