Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcc53f54

Browse files
authored
[assertpy] Replace or explainAnys (#15144)
1 parent1be2c3f commitcc53f54

File tree

9 files changed

+55
-45
lines changed

9 files changed

+55
-45
lines changed
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
# Python 2 compatibility cruft:
2-
assertpy.collection.Iterable
2+
assertpy\..+\.Iterable(\.__class_getitem__)?
33
assertpy.contains.str_types
44
assertpy.contains.xrange
5-
assertpy.dynamic.Iterable
6-
assertpy.exception.Iterable
7-
assertpy.extracting.Iterable
85
assertpy.extracting.str_types
96
assertpy.file.str_types
10-
assertpy.helpers.Iterable
11-
assertpy.string.Iterable
127
assertpy.string.str_types

‎stubs/assertpy/assertpy/assertpy.pyi‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
importlogging
22
fromcollections.abcimportCallable,Generator
3-
fromtypingimportAny
3+
fromtypingimportAny,TypeVar
44
fromtyping_extensionsimportSelf
55

66
from .baseimportBaseMixin
@@ -17,11 +17,14 @@ from .numeric import NumericMixin
1717
from .snapshotimportSnapshotMixin
1818
from .stringimportStringMixin
1919

20+
_T=TypeVar("_T")
21+
_V=TypeVar("_V",default=Any)
22+
2023
__version__:str
2124
__tracebackhide__:bool
2225

2326
classWarningLoggingAdapter(logging.LoggerAdapter[logging.Logger]):
24-
defprocess(self,msg:str,kwargs:Any)->tuple[str,Any]: ...
27+
defprocess(self,msg:str,kwargs:_T)->tuple[str,_T]: ...
2528

2629
classAssertionBuilder(
2730
StringMixin,
@@ -34,36 +37,36 @@ class AssertionBuilder(
3437
DynamicMixin,
3538
DictMixin,
3639
DateMixin,
37-
ContainsMixin,
38-
CollectionMixin,
40+
ContainsMixin[_V],
41+
CollectionMixin[_V],
3942
BaseMixin,
4043
):
41-
val:Any
44+
val:_V
4245
description:str
4346
kind:str|None
4447
expected:BaseException|None
4548
logger:logging.Logger
4649
def__init__(
4750
self,
48-
val:Any,
51+
val:_V,
4952
description:str="",
5053
kind:str|None=None,
5154
expected:BaseException|None=None,
5255
logger:logging.Logger|None=None,
5356
)->None: ...
5457
defbuilder(
5558
self,
56-
val:Any,
59+
val:_V,
5760
description:str="",
5861
kind:str|None=None,
5962
expected:BaseException|None=None,
6063
logger:logging.Logger|None=None,
6164
)->Self: ...
6265
deferror(self,msg:str)->Self: ...
6366

64-
defsoft_assertions()->Generator[None,None,None]: ...
65-
defassert_that(val:Any,description:str="")->AssertionBuilder: ...
66-
defassert_warn(val:Any,description:str="",logger:logging.Logger|None=None)->AssertionBuilder: ...
67+
defsoft_assertions()->Generator[None]: ...
68+
defassert_that(val:_V,description:str="")->AssertionBuilder[_V]: ...
69+
defassert_warn(val:_V,description:str="",logger:logging.Logger|None=None)->AssertionBuilder: ...
6770
deffail(msg:str="")->None: ...
6871
defsoft_fail(msg:str="")->None: ...
6972
defadd_extension(func:Callable[[AssertionBuilder],AssertionBuilder])->None: ...

‎stubs/assertpy/assertpy/base.pyi‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
fromtypingimportAny
21
fromtyping_extensionsimportSelf,TypeAlias
32

43
__tracebackhide__:bool
@@ -8,10 +7,10 @@ _IncludeIgnore: TypeAlias = str | list[str] | list[tuple[str, ...]] | None
87
classBaseMixin:
98
description:str
109
defdescribed_as(self,description:str)->Self: ...
11-
defis_equal_to(self,other:Any,*,include:_IncludeIgnore=None,ignore:_IncludeIgnore=None)->Self: ...
12-
defis_not_equal_to(self,other:Any)->Self: ...
13-
defis_same_as(self,other:Any)->Self: ...
14-
defis_not_same_as(self,other:Any)->Self: ...
10+
defis_equal_to(self,other:object,*,include:_IncludeIgnore=None,ignore:_IncludeIgnore=None)->Self: ...
11+
defis_not_equal_to(self,other:object)->Self: ...
12+
defis_same_as(self,other:object)->Self: ...
13+
defis_not_same_as(self,other:object)->Self: ...
1514
defis_true(self)->Self: ...
1615
defis_false(self)->Self: ...
1716
defis_none(self)->Self: ...
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
from_typeshedimportSupportsRichComparison
12
fromcollections.abcimportCallable
2-
fromtypingimportAny
3+
fromtypingimportAny,Generic,Literal,TypeVar,overload
34
fromtyping_extensionsimportSelf
45

56
__tracebackhide__:bool
67

7-
classCollectionMixin:
8+
_V=TypeVar("_V",default=Any)
9+
10+
classCollectionMixin(Generic[_V]):
811
defis_iterable(self)->Self: ...
912
defis_not_iterable(self)->Self: ...
10-
defis_subset_of(self,*supersets:Any)->Self: ...
11-
defis_sorted(self,key:Callable[[Any],Any]= ...,reverse:bool=False)->Self: ...
13+
defis_subset_of(self,*supersets:_V)->Self: ...
14+
@overload
15+
defis_sorted(self,key:Callable[[_V],SupportsRichComparison]= ...,reverse:Literal[False]=False)->Self: ...
16+
@overload
17+
defis_sorted(self,*,reverse:Literal[True])->Self: ...
18+
@overload
19+
defis_sorted(self,key:Callable[[_V],SupportsRichComparison],reverse:Literal[True])->Self: ...
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
fromtypingimportAny
1+
fromtypingimportAny,Generic,TypeVar
22
fromtyping_extensionsimportSelf
33

44
__tracebackhide__:bool
55

6-
classContainsMixin:
7-
defcontains(self,*items:Any)->Self: ...
8-
defdoes_not_contain(self,*items:Any)->Self: ...
9-
defcontains_only(self,*items:Any)->Self: ...
10-
defcontains_sequence(self,*items:Any)->Self: ...
6+
_V=TypeVar("_V",default=Any)
7+
8+
classContainsMixin(Generic[_V]):
9+
defcontains(self,*items:object)->Self: ...
10+
defdoes_not_contain(self,*items:object)->Self: ...
11+
defcontains_only(self,*items:object)->Self: ...
12+
defcontains_sequence(self,*items:object)->Self: ...
1113
defcontains_duplicates(self)->Self: ...
1214
defdoes_not_contain_duplicates(self)->Self: ...
1315
defis_empty(self)->Self: ...
1416
defis_not_empty(self)->Self: ...
15-
defis_in(self,*items:Any)->Self: ...
16-
defis_not_in(self,*items:Any)->Self: ...
17+
defis_in(self,*items:_V)->Self: ...
18+
defis_not_in(self,*items:_V)->Self: ...

‎stubs/assertpy/assertpy/dict.pyi‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
fromcollections.abcimportIterable
12
fromtypingimportAny
23
fromtyping_extensionsimportSelf
34

45
__tracebackhide__:bool
56

67
classDictMixin:
7-
defcontains_key(self,*keys:Any)->Self: ...
8-
defdoes_not_contain_key(self,*keys:Any)->Self: ...
9-
defcontains_value(self,*values:Any)->Self: ...
10-
defdoes_not_contain_value(self,*values:Any)->Self: ...
11-
defcontains_entry(self,*args:Any,**kwargs:dict[str,Any])->Self: ...
12-
defdoes_not_contain_entry(self,*args:Any,**kwargs:dict[str,Any])->Self: ...
8+
defcontains_key(self,*keys:object)->Self: ...
9+
defdoes_not_contain_key(self,*keys:object)->Self: ...
10+
defcontains_value(self,*values:object)->Self: ...
11+
defdoes_not_contain_value(self,*values:object)->Self: ...
12+
# The dicts can contain arbitrary keys and values
13+
defcontains_entry(self,*args:Iterable[dict[Any,Any]],**kwargs:Any)->Self: ...
14+
defdoes_not_contain_entry(self,*args:Iterable[dict[Any,Any]],**kwargs:Any)->Self: ...

‎stubs/assertpy/assertpy/dynamic.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ from typing_extensions import Self
44
__tracebackhide__:bool
55

66
classDynamicMixin:
7-
def__getattr__(self,attr:str)->Callable[...,Self]: ...
7+
def__getattr__(self,attr:str)->Callable[[object],Self]: ...
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
fromcollections.abcimportCallable,Iterableas_Iterable,Mapping
1+
from_typeshedimportSupportsRichComparison
2+
fromcollections.abcimportCallable,Iterable,Mapping
23
fromtypingimportAny
34
fromtyping_extensionsimportSelf
45

@@ -8,6 +9,7 @@ class ExtractingMixin:
89
defextracting(
910
self,
1011
*names:str,
12+
# The callable must accept the type of the items in the self.val collection.
1113
filter:str|Mapping[str,Any]|Callable[[Any],bool]= ...,
12-
sort:str|_Iterable[str]|Callable[[Any],Any]= ...,
14+
sort:str|Iterable[str]|Callable[[Any],SupportsRichComparison]= ...,
1315
)->Self: ...

‎stubs/assertpy/assertpy/file.pyi‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from_typeshedimportStrPath
2-
fromtypingimportIO,AnyStr
1+
from_typeshedimportStrPath,SupportsRead
32
fromtyping_extensionsimportSelf
43

54
__tracebackhide__:bool
65

7-
defcontents_of(file:IO[AnyStr]|StrPath,encoding:str="utf-8")->str: ...
6+
defcontents_of(file:SupportsRead[str]|StrPath,encoding:str="utf-8")->str: ...
87

98
classFileMixin:
109
defexists(self)->Self: ...

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp