From 6833af22362a756add92cd7e1fdd83fa9873252d Mon Sep 17 00:00:00 2001 From: Adrien Vannson Date: Thu, 20 Nov 2025 16:25:16 +0100 Subject: [PATCH] Small cleaning --- betterproto2/src/betterproto2/__init__.py | 18 ------------------ .../betterproto2_compiler/plugin/compiler.py | 17 ++--------------- .../src/betterproto2_compiler/plugin/models.py | 5 +---- 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/betterproto2/src/betterproto2/__init__.py b/betterproto2/src/betterproto2/__init__.py index 3a977e1b..98221ec1 100644 --- a/betterproto2/src/betterproto2/__init__.py +++ b/betterproto2/src/betterproto2/__init__.py @@ -1301,24 +1301,6 @@ def _validate_field_groups(cls, values): Message.__annotations__ = {} # HACK to avoid typing.get_type_hints breaking :) -# The Rust codec is not available for now -# try: -# import betterproto2_rust_codec # pyright: ignore[reportMissingImports] -# except ModuleNotFoundError: -# pass -# else: - -# def parse_patched(self, data: bytes) -> Message: -# betterproto2_rust_codec.deserialize(self, data) -# return self - -# def bytes_patched(self) -> bytes: -# return betterproto2_rust_codec.serialize(self) - -# Message.parse = parse_patched -# Message.__bytes__ = bytes_patched - - def which_one_of(message: Message, group_name: str) -> tuple[str, Any | None]: """ Return the name and value of a message's one-of field group. diff --git a/betterproto2_compiler/src/betterproto2_compiler/plugin/compiler.py b/betterproto2_compiler/src/betterproto2_compiler/plugin/compiler.py index 3957b998..fbe4bd29 100644 --- a/betterproto2_compiler/src/betterproto2_compiler/plugin/compiler.py +++ b/betterproto2_compiler/src/betterproto2_compiler/plugin/compiler.py @@ -3,23 +3,10 @@ import sys from importlib import metadata -from .module_validation import ModuleValidator - -try: - # betterproto[compiler] specific dependencies - import jinja2 -except ImportError as err: - print( - "\033[31m" - f"Unable to import `{err.name}` from betterproto plugin! " - "Please ensure that you've installed betterproto as " - '`pip install "betterproto[compiler]"` so that compiler dependencies ' - "are included." - "\033[0m", - ) - raise SystemExit(1) +import jinja2 from .models import OutputTemplate +from .module_validation import ModuleValidator def outputfile_compiler(output_file: OutputTemplate) -> str: diff --git a/betterproto2_compiler/src/betterproto2_compiler/plugin/models.py b/betterproto2_compiler/src/betterproto2_compiler/plugin/models.py index caceab48..085e43b0 100644 --- a/betterproto2_compiler/src/betterproto2_compiler/plugin/models.py +++ b/betterproto2_compiler/src/betterproto2_compiler/plugin/models.py @@ -27,10 +27,7 @@ import builtins import inspect from collections.abc import Iterator -from dataclasses import ( - dataclass, - field, -) +from dataclasses import dataclass, field from betterproto2 import unwrap