Skip to content

Commit cedb469

Browse files
authored
Merge pull request #202 from uriyyo/feature/remove-deprecated-api
♻️ Remove deprecated API
2 parents b9b5932 + 4317406 commit cedb469

File tree

4 files changed

+4
-110
lines changed

4 files changed

+4
-110
lines changed

fastapi_pagination/__init__.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,23 @@
11
from .api import (
22
add_pagination,
33
create_page,
4-
pagination_params,
54
request,
65
resolve_params,
76
response,
87
set_page,
9-
use_as_page,
10-
using_page,
11-
using_params,
12-
using_response,
138
)
14-
from .default import Page, PaginationParams, Params
9+
from .default import Page, Params
1510
from .limit_offset import LimitOffsetPage, LimitOffsetParams
1611
from .paginator import paginate
1712

1813
__all__ = [
1914
"add_pagination",
2015
"create_page",
21-
"pagination_params",
2216
"request",
2317
"resolve_params",
2418
"response",
2519
"set_page",
26-
"use_as_page",
27-
"using_page",
28-
"using_params",
29-
"using_response",
3020
"Page",
31-
"PaginationParams",
3221
"Params",
3322
"LimitOffsetPage",
3423
"LimitOffsetParams",

fastapi_pagination/api.py

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
import inspect
2-
import warnings
3-
from contextlib import contextmanager
42
from contextvars import ContextVar
5-
from typing import (
6-
Any,
7-
Awaitable,
8-
Callable,
9-
ContextManager,
10-
Iterator,
11-
Optional,
12-
Sequence,
13-
Type,
14-
TypeVar,
15-
cast,
16-
)
3+
from typing import Awaitable, Callable, Optional, Sequence, Type, TypeVar, cast
174

185
from fastapi import Depends, FastAPI, Request, Response
196
from fastapi.dependencies.utils import (
@@ -23,8 +10,7 @@
2310
from fastapi.routing import APIRoute, APIRouter
2411

2512
from .bases import AbstractPage, AbstractParams
26-
from .default import Page, Params
27-
from .utils import deprecated
13+
from .default import Page
2814

2915
T = TypeVar("T")
3016
TAbstractParams = TypeVar("TAbstractParams", covariant=True, bound=AbstractParams)
@@ -133,61 +119,11 @@ def add_pagination(parent: ParentT) -> ParentT:
133119
return parent
134120

135121

136-
@deprecated
137-
def using_params(
138-
params_type: Type[TAbstractParams],
139-
) -> Callable[[TAbstractParams], Awaitable[TAbstractParams]]: # pragma: no cover
140-
async def _pagination_params(*args, **kwargs) -> params_type: # type: ignore
141-
params = params_type(*args, **kwargs) # type: ignore
142-
params_value.set(params)
143-
return params
144-
145-
_pagination_params.__signature__ = inspect.signature(params_type) # type: ignore
146-
147-
return _pagination_params
148-
149-
150-
with warnings.catch_warnings():
151-
warnings.simplefilter("ignore")
152-
pagination_params = using_params(Params)
153-
154-
155-
@deprecated
156-
def using_page(page: Type[AbstractPage]) -> ContextManager[None]: # pragma: no cover
157-
token = page_type.set(page)
158-
159-
@contextmanager
160-
def _reset() -> Iterator[None]:
161-
try:
162-
yield
163-
finally:
164-
page_type.reset(token)
165-
166-
return _reset()
167-
168-
169-
@deprecated
170-
def use_as_page(page: Any) -> Any: # pragma: no cover
171-
using_page(page)
172-
return page
173-
174-
175-
@deprecated
176-
async def using_response(res: Response) -> None: # pragma: no cover
177-
response_value.set(res)
178-
179-
180122
__all__ = [
181123
"add_pagination",
182124
"create_page",
183125
"resolve_params",
184126
"response",
185127
"request",
186128
"set_page",
187-
# deprecated api
188-
"using_response",
189-
"using_params",
190-
"using_page",
191-
"use_as_page",
192-
"pagination_params",
193129
]

fastapi_pagination/default.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
from __future__ import annotations
22

3-
from typing import Any, Generic, Sequence, TypeVar
3+
from typing import Generic, Sequence, TypeVar
44

55
from fastapi import Query
66
from pydantic import BaseModel, conint
77

88
from .bases import AbstractParams, BasePage, RawParams
9-
from .utils import deprecated
109

1110
T = TypeVar("T")
1211

@@ -22,12 +21,6 @@ def to_raw_params(self) -> RawParams:
2221
)
2322

2423

25-
class PaginationParams(Params):
26-
@deprecated # type: ignore
27-
def __init__(self, **kwargs: Any) -> None: # pragma: no cover
28-
super().__init__(**kwargs)
29-
30-
3124
class Page(BasePage[T], Generic[T]):
3225
page: conint(ge=1) # type: ignore
3326
size: conint(ge=1) # type: ignore
@@ -55,5 +48,4 @@ def create(
5548
__all__ = [
5649
"Params",
5750
"Page",
58-
"PaginationParams",
5951
]

fastapi_pagination/utils.py

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

0 commit comments

Comments
 (0)