Conversation
bluetech
left a comment
bluetech
left a comment
There was a problem hiding this comment.
LGTM.
I wonder if might be worth it to solve this centrally, maybe handrolling a version of unittest.mock.sentinel: https://github.com/python/cpython/blob/e263bb1e97ae8f84fb4f2ab5b0c4f529a2e5696d/Lib/unittest/mock.py#L276-L307
src/_pytest/pytester.py
Outdated
|
|
||
| CLOSE_STDIN = object | ||
| class CLOSE_STDIN: | ||
| pass |
There was a problem hiding this comment.
| pass | |
| __slots__ = () |
There was a problem hiding this comment.
Hmm given that you use the class itself as the sentinel and not an instance of it, this suggestion doesn't matter much...
There was a problem hiding this comment.
an enum instance is usually pretty good
class CloseStdinType(enum.Enum):
CLOSE_STDIN = enum.auto()
CLOSE_STDIN = CloseStdinType.CLOSE_STDINit's great for type annotations too
There was a problem hiding this comment.
and it's got that None/NoneType feel
There was a problem hiding this comment.
@blueyed it enables type annotations like:
def popen(self, ..., stdin=CLOSE_STDIN: Union[CloseStdinType,bytes,int]): -> ...
There was a problem hiding this comment.
@graingert Right, this is the best current way to do it in type-compatible way: python/typing#689. Also what I opted for here: bluetech@bcd19fa#diff-4ec37b1ad5b7d41fdac56c907d08dde1R46-R52
There was a problem hiding this comment.
What's wrong with stdin: Optional[Union[…, Type[CLOSE_STDIN]]] = CLOSE_STDIN,?
It might be not as strict really, but serves the purpose in general, and has less/no boilerplate.
There was a problem hiding this comment.
Nothing wrong really, just that using a Type[...] as a sentinel is odd/surprising. I'd go with @graingert's suggestion, which is the "official" way to do it.
That said if you prefer the Type that's fine.
I'm not opposed to it. Given that this needs to be rebased anyway suggestions are welcome. |
blueyed
force-pushed
the
pytester-CLOSE_STDIN-upstream
branch
from
0dd5677 to
d8a42f8
Compare
blueyed
force-pushed
the
pytester-CLOSE_STDIN-upstream
branch
3 times, most recently
from
6dfee78 to
64428a1
Compare
blueyed
force-pushed
the
pytester-CLOSE_STDIN-upstream
branch
2 times, most recently
from
133aa67 to
07c05a9
Compare
This makes it / it's repr more meaningful in docs, and should have been `object()` anyway.
blueyed
force-pushed
the
pytester-CLOSE_STDIN-upstream
branch
from
07c05a9 to
2fdf0f5
Compare
|
|
||
|
|
||
| class Testdir: | ||
| class Testdir(Generic[AnyStr]): |
There was a problem hiding this comment.
I don't see AnyStr mentioned elsewhere, why did you need this generic?
| stdout=subprocess.PIPE, | ||
| stderr=subprocess.PIPE, | ||
| stdin=CLOSE_STDIN, | ||
| stdout: Optional[Union[int, IO]] = subprocess.PIPE, |
There was a problem hiding this comment.
Is it specifically IO[str] or IO[bytes]?
I see that typeshed punts on this: https://github.com/python/typeshed/blob/d8b081130d3e3a7fde1a49ac787d304f5c4c1966/stdlib/3/subprocess.pyi#L13-L27
There was a problem hiding this comment.
I've used AnyStr here initially (but forgot to clean it up).
I've figured IO is the same as IO[Any]. Do you prefer the latter?
We basically have the _FILE from typeshed here: Union[None, int, IO[Any]]
There was a problem hiding this comment.
I'd leave it with the explicit Any (like you did), maybe can be filled with something precise in the future.
There was a problem hiding this comment.
It can be str or bytes. typeshed binds it according to overloads.
| stdin=CLOSE_STDIN, | ||
| stdout: Optional[Union[int, IO]] = subprocess.PIPE, | ||
| stderr: Optional[Union[int, IO]] = subprocess.PIPE, | ||
| stdin: Optional[Union[CloseStdinType, bytes, int, IO]] = CLOSE_STDIN, |
There was a problem hiding this comment.
Does Literal[CLOSE_STDIN] work? If yes, that'd be a little nicer. (I think it is planned to work, but I don't remember if it does already).
|
Closing for now. |
4 participants
This makes it / it's repr more meaningful in docs, and should have been
object()anyway.TODO: