Skip to content
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

Code with keywords fixes #137

Merged
merged 5 commits into from
Aug 9, 2020
Merged

Code with keywords fixes #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4208225
Code with keywords fixes
Gobot1234 Aug 6, 2020
7c39b1c
Don't modify Enum's casings
Gobot1234 Aug 6, 2020
c65791d
Update casing.py
Gobot1234 Aug 6, 2020
3ac11a6
Update models.py
Gobot1234 Aug 6, 2020
a24c9a1
I don't think this will change anything
Gobot1234 Aug 6, 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
43 changes: 7 additions & 36 deletions src/betterproto/casing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import keyword
import re

# Word delimiters and symbols that will not be preserved when re-casing.
Expand All @@ -16,42 +17,7 @@
def safe_snake_case(value: str) -> str:
"""Snake case a value taking into account Python keywords."""
value = snake_case(value)
if value in [
"and",
"as",
"assert",
"async",
"await",
"break",
"class",
"continue",
"def",
"del",
"elif",
"else",
"except",
"finally",
"for",
"from",
"global",
"if",
"import",
"in",
"is",
"lambda",
"nonlocal",
"not",
"or",
"pass",
"raise",
"return",
"try",
"while",
"with",
"yield",
]:
# https://www.python.org/dev/peps/pep-0008/#descriptive-naming-styles
value += "_"
value = sanitize_name(value)
return value


Expand Down Expand Up @@ -120,3 +86,8 @@ def camel_case(value: str, strict: bool = True):

def lowercase_first(value: str):
return value[0:1].lower() + value[1:]


def sanitize_name(value: str) -> str:
# https://www.python.org/dev/peps/pep-0008/#descriptive-naming-styles
return f"{value}_" if keyword.iskeyword(value) else value
4 changes: 3 additions & 1 deletion src/betterproto/plugin/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
pythonize_method_name,
)

from ..casing import sanitize_name

try:
# betterproto[compiler] specific dependencies
from google.protobuf.compiler import plugin_pb2 as plugin
Expand Down Expand Up @@ -542,7 +544,7 @@ def __post_init__(self):
# Get entries/allowed values for this Enum
self.entries = [
self.EnumEntry(
name=entry_proto_value.name,
name=sanitize_name(entry_proto_value.name),
value=entry_proto_value.number,
comment=get_comment(
proto_file=self.proto_file, path=self.path + [2, entry_number]
Expand Down