From 3ca75dadd7679ecb8abbf2fdb82852b085b07be4 Mon Sep 17 00:00:00 2001 From: boukeversteegh Date: Thu, 11 Jun 2020 00:22:23 +0200 Subject: [PATCH] Remove dependency on stringcase, apply black --- betterproto/__init__.py | 5 ++--- betterproto/compile/importing.py | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/betterproto/__init__.py b/betterproto/__init__.py index 9ed73f6..bcd9292 100644 --- a/betterproto/__init__.py +++ b/betterproto/__init__.py @@ -28,9 +28,8 @@ from typing import ( import grpclib.const -import stringcase -from .casing import safe_snake_case, snake_case +from .casing import camel_case, safe_snake_case, snake_case if TYPE_CHECKING: from grpclib._protocols import IProtoMessage @@ -131,7 +130,7 @@ DATETIME_ZERO = datetime_default_gen() class Casing(enum.Enum): """Casing constants for serialization.""" - CAMEL = stringcase.camelcase + CAMEL = camel_case SNAKE = snake_case diff --git a/betterproto/compile/importing.py b/betterproto/compile/importing.py index 091812b..115ba78 100644 --- a/betterproto/compile/importing.py +++ b/betterproto/compile/importing.py @@ -154,8 +154,10 @@ def import_cousin(current_package, imports, py_package, py_type): ) string_import = py_package[-1] # Add trailing __ to avoid name mangling (python.org/dev/peps/pep-0008/#id34) - string_alias = f"{'_' * distance_up}" + safe_snake_case( - ".".join(py_package[len(shared_ancestry) :]) - ) + "__" + string_alias = ( + f"{'_' * distance_up}" + + safe_snake_case(".".join(py_package[len(shared_ancestry) :])) + + "__" + ) imports.add(f"from {string_from} import {string_import} as {string_alias}") return f"{string_alias}.{py_type}"