-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Use Literal to improve SpooledTemporaryFile #3526
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use Literal to improve SpooledTemporaryFile #3526
Conversation
Previously, SpooledTemporaryFile was always an AnyStr. Now, we load a SpooledTemporaryFile[bytes] if we open in bytes mode, and we load a SpooledTemporaryFile[str] if we open in str mode.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Two small remarks below.
def __init__( | ||
self: SpooledTemporaryFile[bytes], | ||
max_size: int = ..., | ||
mode: Literal["rb", "wb", "ab", "xb", "r+b", "w+b", "a+b", "x+b"] = ..., |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also just "b"
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The mode "b"
and ""
both cause errors in Python 2.7 and 3.7. I haven't tested on other Python versions, but I don't see why they would be different.
Trying to instantiate a TemporaryFile
(done when a SpooledTemporaryFile
rolls over) with a mode string not containing exactly one of rwax
and more than one +
will raise ValueError: Must have exactly one of create/read/write/append mode and at most one plus
on Python 3.7.4.
Python 2.7.16 has a similar error: ValueError: mode string must begin with one of 'r', 'w', 'a' or 'U', not 'b'
.
Confusingly, the SpooledTemporaryFile
constructor accepts any mode, but an exception is raised only when it creates a TemporaryFile
internally. This can be forced by using the rollover()
function.
Test case:
import tempfile
# this line works fine
with tempfile.SpooledTemporaryFile(mode="b") as tmpfile:
# this line fails, since the invalid mode is checked here
tmpfile.rollover()
def __init__( | ||
self: SpooledTemporaryFile[str], | ||
max_size: int = ..., | ||
mode: Literal["r", "w", "a", "x", "r+", "w+", "a+", "x+", "rt", "wt", "at", "xt", "r+t", "w+t", "a+t", "x+t"] = ..., |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also just ""
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same error as above on Python 3.7.4, Python 2.7.16 has it's own ValueError: empty mode string
error. It is only seen after the SpooledTemporaryFile creates a TemporaryFile
internally, which can be forced using ~SpooledTemporaryFile.rollover()
.
import tempfile
with tempfile.SpooledTemporaryFile(mode="") as tmpfile:
tmpfile.rollover() # empty mode fails on this line, not at constructor
Thanks for the review @srittau. I think the two modes you asked me to add are not valid modes. Confusingly, There is a mode |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the explanation. I only tried constructing the file and reading from it, which worked.
Specifies that a
SpooledTemporaryFile[bytes]
is constructed if we open the file inbytes
mode,and a
SpooledTemporaryFile[str]
is constructed if we open the file instr
mode.I've also ran
black
on thestdlib/3/tempfile.pyi
file I changed, since CONTRIBUTING.md says that style-fixes are accepted.I'm using the newly added to mypy python/typing#680 to do this, as @srittau recommended.
Fixes #3360.
Test case:
Prints the following with the latest version of mypy, so it looks like everything is working fine.