Skip to content

Python3 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdombroski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python3 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18db14c
using plugin_pb2 from installed python
Nov 4, 2020
df8b0ff
update to python3
Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 0 additions & 159 deletions protoc-plugin/plugin_pb2.py
View file
Open in desktop

This file was deleted.

24 changes: 14 additions & 10 deletions protoc-plugin/protoc-gen-lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
#-*- coding: utf-8 -*-
#
# Google's Protocol Buffers project, ported to lua.
Expand All @@ -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
Expand Down Expand Up @@ -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')
Expand All @@ -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)

Expand All @@ -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()
Expand Down