From 983e0895a257b87fb770f5acff071d7e9f3b7095 Mon Sep 17 00:00:00 2001 From: andrei Date: Mon, 4 May 2020 15:12:57 -0700 Subject: [PATCH] Fix services using non-pythonified field names --- betterproto/templates/template.py | 8 ++++---- betterproto/tests/inputs/keywords/keywords.proto | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/betterproto/templates/template.py b/betterproto/templates/template.py index 4c18ccc..3a19422 100644 --- a/betterproto/templates/template.py +++ b/betterproto/templates/template.py @@ -63,7 +63,7 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub): {% endif %} {% for method in service.methods %} - async def {{ method.py_name }}(self{% if method.input_message and method.input_message.properties %}, *, {% for field in method.input_message.properties %}{{ field.name }}: {% if field.zero == "None" and not field.type.startswith("Optional[") %}Optional[{{ field.type }}]{% else %}{{ field.type }}{% endif %} = {{ field.zero }}{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}) -> {% if method.server_streaming %}AsyncGenerator[{{ method.output }}, None]{% else %}{{ method.output }}{% endif %}: + async def {{ method.py_name }}(self{% if method.input_message and method.input_message.properties %}, *, {% for field in method.input_message.properties %}{{ field.py_name }}: {% if field.zero == "None" and not field.type.startswith("Optional[") %}Optional[{{ field.type }}]{% else %}{{ field.type }}{% endif %} = {{ field.zero }}{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}) -> {% if method.server_streaming %}AsyncGenerator[{{ method.output }}, None]{% else %}{{ method.output }}{% endif %}: {% if method.comment %} {{ method.comment }} @@ -71,10 +71,10 @@ class {{ service.py_name }}Stub(betterproto.ServiceStub): request = {{ method.input }}() {% for field in method.input_message.properties %} {% if field.field_type == 'message' %} - if {{ field.name }} is not None: - request.{{ field.name }} = {{ field.name }} + if {{ field.py_name }} is not None: + request.{{ field.py_name }} = {{ field.py_name }} {% else %} - request.{{ field.name }} = {{ field.name }} + request.{{ field.py_name }} = {{ field.py_name }} {% endif %} {% endfor %} diff --git a/betterproto/tests/inputs/keywords/keywords.proto b/betterproto/tests/inputs/keywords/keywords.proto index 25b87f1..57c998b 100644 --- a/betterproto/tests/inputs/keywords/keywords.proto +++ b/betterproto/tests/inputs/keywords/keywords.proto @@ -5,3 +5,7 @@ message Test { int32 with = 2; int32 as = 3; } + +service TestService { + rpc GetTest(Test) returns (Test) {} +}