Merge branch 'master' into client-streaming

2020-06-23 22:02:23 +02:00
parent 5c9a12e2f6 5fb4b4b7ff
commit 0c5d1ff868
14 changed files with 1151 additions and 560 deletions
--- a/betterproto/plugin.py
+++ b/betterproto/plugin.py
@@ -41,9 +41,9 @@ def py_type(
    message: DescriptorProto,
    descriptor: FieldDescriptorProto,
 ) -> str:
-    if descriptor.type in [1, 2, 6, 7, 15, 16]:
+    if descriptor.type in [1, 2]:
        return "float"
-    elif descriptor.type in [3, 4, 5, 13, 17, 18]:
+    elif descriptor.type in [3, 4, 5, 6, 7, 13, 15, 16, 17, 18]:
        return "int"
    elif descriptor.type == 8:
        return "bool"