actually fix conflicts

This commit is contained in:
Benedikt Bartscher 2024-09-10 22:25:09 +02:00
parent fc58c38954
commit 7d3071e747
No known key found for this signature in database

View File

@ -7,6 +7,7 @@ import dataclasses
import random import random
import re import re
import string import string
from collections.abc import Callable
from typing import ( from typing import (
TYPE_CHECKING, TYPE_CHECKING,
Any, Any,
@ -32,7 +33,7 @@ from reflex.utils.imports import (
ParsedImportDict, ParsedImportDict,
parse_imports, parse_imports,
) )
from reflex.utils.types import Self, get_origin, override from reflex.utils.types import Self, override
if TYPE_CHECKING: if TYPE_CHECKING:
from reflex.ivars import ImmutableVar from reflex.ivars import ImmutableVar
@ -502,6 +503,9 @@ def get_uuid_string_var() -> ImmutableVar:
) )
VAR_CALLABLE = Callable[[Any], Var]
class HybridProperty(property): class HybridProperty(property):
"""A hybrid property that can also be used in frontend/as var.""" """A hybrid property that can also be used in frontend/as var."""