Skip to content

Commit 97fd40f

Browse files
committed
code refactor: rename ellar.common.helper to ellar.common.utils
1 parent 1067360 commit 97fd40f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+64
-79
lines changed

ellar/cache/backends/local_cache.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from collections import OrderedDict
66

77
from anyio import Lock
8-
from ellar.common.helper.event_loop import get_or_create_eventloop
8+
from ellar.common.utils.event_loop import get_or_create_eventloop
99

1010
from ..interface import IBaseCacheBackendAsync
1111
from ..make_key_decorator import make_key_decorator, make_key_decorator_and_validate

ellar/cache/backends/redis/backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import typing as t
33
from abc import ABC
44

5-
from ellar.common.helper.event_loop import get_or_create_eventloop
5+
from ellar.common.utils.event_loop import get_or_create_eventloop
66

77
try:
88
from redis.asyncio import Redis

ellar/cache/make_key_decorator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import functools
22
import typing as t
33

4-
from ellar.common.helper import is_async_callable
4+
from ellar.common.utils import is_async_callable
55

66
if t.TYPE_CHECKING: # pragma: no cover
77
from .model import BaseCacheBackend

ellar/common/decorators/html.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
TEMPLATE_GLOBAL_KEY,
1111
)
1212
from ellar.common.exceptions import ImproperConfiguration
13-
from ellar.common.helper import class_base_function_regex, get_name
1413
from ellar.common.responses.models import HTMLResponseModel
1514
from ellar.common.shortcuts import fail_silently
1615
from ellar.common.templating import TemplateFunctionData
1716
from ellar.common.types import TemplateFilterCallable, TemplateGlobalCallable
17+
from ellar.common.utils import class_base_function_regex, get_name
1818

1919
from .base import set_metadata as set_meta
2020

ellar/common/exceptions/callable_exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22

3-
from ellar.common.helper import is_async_callable
43
from ellar.common.interfaces import IExceptionHandler, IHostContext
4+
from ellar.common.utils import is_async_callable
55
from starlette.concurrency import run_in_threadpool
66
from starlette.responses import Response
77

ellar/common/interfaces/controller_factory.py

Lines changed: 0 additions & 11 deletions
This file was deleted.

ellar/common/params/args/factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import inspect
22
import typing as t
33

4-
from ellar.common.helper.modelfield import create_model_field
4+
from ellar.common.utils.modelfield import create_model_field
55
from pydantic.fields import FieldInfo, ModelField, Required
66
from pydantic.schema import get_annotation_from_field_info
77

ellar/common/params/args/request_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import typing as t
22

33
from ellar.common.constants import MULTI_RESOLVER_KEY
4-
from ellar.common.helper.modelfield import create_model_field
54
from ellar.common.interfaces import IExecutionContext
65
from ellar.common.logger import logger
6+
from ellar.common.utils.modelfield import create_model_field
77
from pydantic import BaseModel, create_model
88
from pydantic.fields import ModelField
99
from starlette.convertors import Convertor

ellar/common/params/params.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import copy
2-
import re
3-
import sys
41
import typing as t
52
from enum import Enum
63

@@ -22,13 +19,6 @@
2219
WsBodyParameterResolver,
2320
)
2421

25-
if sys.version_info >= (3, 6):
26-
27-
def copier(x: t.Any, memo: t.Dict) -> t.Any:
28-
return x
29-
30-
copy._deepcopy_dispatch[type(re.compile(""))] = copier # type: ignore
31-
3222

3323
class ParamTypes(Enum):
3424
query = "query"

ellar/common/responses/models/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
from ellar.common.constants import SERIALIZER_FILTER_KEY
55
from ellar.common.exceptions import RequestValidationError
6-
from ellar.common.helper.modelfield import create_model_field
76
from ellar.common.interfaces import IExecutionContext, IResponseModel
87
from ellar.common.logger import request_logger
98
from ellar.common.serializer import SerializerFilter, serialize_object
9+
from ellar.common.utils.modelfield import create_model_field
1010
from ellar.reflect import reflect
1111
from pydantic import BaseModel
1212
from pydantic.fields import ModelField

0 commit comments

Comments
 (0)