Skip to content

Add _socket constants from CPython 3.10 #3840

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.

Sign up for GitHub

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

Merged
youknowone merged 6 commits into from
Jul 6, 2022
Merged

Add _socket constants from CPython 3.10 #3840

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca90bf3
Add `_socket` constants from CPython 3.10
fanninpm Jul 4, 2022
4e87250
Fix compilation errors on macOS and Windows
fanninpm Jul 4, 2022
97db885
Resolve ambiguous imports on Windows
fanninpm Jul 4, 2022
92f790e
Mark erroring/failing tests
fanninpm Jul 5, 2022
b39263d
Mark erroring test on Windows
fanninpm Jul 5, 2022
0b1a542
Unmark passing test on macOS and Windows
fanninpm Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix compilation errors on macOS and Windows
  • Loading branch information
@fanninpm
fanninpm committed Jul 4, 2022
commit 4e87250ba253859a3885a9a8eb075f20c9f941e4
17 changes: 15 additions & 2 deletions stdlib/src/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ mod _socket {
pub use winapi::shared::netioapi::{if_indextoname, if_nametoindex};
pub use winapi::shared::ws2def::*;
pub use winapi::shared::ws2ipdef::*;
pub use winapi::shared::ws2tcpip::*;
pub use winapi::um::winsock2::{
SD_BOTH as SHUT_RDWR, SD_RECEIVE as SHUT_RD, SD_SEND as SHUT_WR, SOCK_DGRAM, SOCK_RAW,
SOCK_RDM, SOCK_SEQPACKET, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER,
SO_OOBINLINE, SO_REUSEADDR, SO_TYPE, *,
};
pub use winapi::um::ws2tcpip::*;
}
// constants
#[pyattr(name = "has_ipv6")]
Expand Down Expand Up @@ -529,6 +529,19 @@ mod _socket {
#[pyattr]
use c::{TCP_KEEPCNT, TCP_KEEPINTVL};

#[cfg(any(
target_os = "android",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "fuchsia",
target_os = "linux",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
))]
#[pyattr]
use c::{SOCK_CLOEXEC, SOCK_NONBLOCK};

#[cfg(any(
target_os = "android",
target_os = "dragonfly",
Expand All @@ -542,7 +555,7 @@ mod _socket {
#[pyattr]
use c::{
AF_ROUTE, AF_SNA, EAI_OVERFLOW, IPPROTO_GRE, IPPROTO_RSVP, IPPROTO_TP, IPV6_RECVPKTINFO,
MSG_DONTWAIT, SCM_RIGHTS, SOCK_CLOEXEC, SOCK_NONBLOCK, TCP_MAXSEG,
MSG_DONTWAIT, SCM_RIGHTS, TCP_MAXSEG,
};

#[cfg(any(
Expand Down