Refactor ssl module #3147
Merged
Refactor ssl module #3147
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vm/src/stdlib/socket.rs
Outdated
| @@ -170,7 +168,7 @@ impl PySocket { | |||
| PyRwLockReadGuard::try_map(self.sock.read(), |sock| sock.get()).ok() | |||
| } | |||
|
|
|||
| fn sock_io(&self) -> io::Result<PyMappedRwLockReadGuard<'_, Socket>> { | |||
| pub(crate) fn sock_io(&self) -> io::Result<PyMappedRwLockReadGuard<'_, Socket>> { | |||
There was a problem hiding this comment.
Maybe it would make sense to expose a pub send(&[u8]) -> io::Result<usize> and recv(&mut [u8]) -> io::Result<usize> for once the stdlib gets moved out of oh I guess rustpython-vmsocket is also in stdlib. But the above still seems like a better abstraction than exposing ReadGuard.
There was a problem hiding this comment.
(and flush() for sockets is a no-op)
There was a problem hiding this comment.
thanks. I implemented io::Read and io::Write for &PySocket and used it from ssl
coolreader18
approved these changes
Sep 26, 2021
a78ead6 to
e0ba09d
Compare
e0ba09d to
b195b10
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I moved
io::Readandio::Writefor PySocketRef to ssl. If they are implemented forPySocket, it would be member of socket. But thePyRef<PySocket>requirement is decided byssl::SslStream. not by socket itself. So I moved it to ssl to make them specific to ssl requirement.part of #3104