Skip to content

Commit a87be4f

Browse files
fix: sync with remote and finalize socket constants
2 parents b9f25b7 + 3efa725 commit a87be4f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

stdlib/_socket.pyi

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ if sys.platform == "linux":
3737
if sys.version_info >= (3, 14):
3838
SOCK_CLOEXEC: Final[int]
3939
SOCK_NONBLOCK: Final[int]
40+
<<<<<<< HEAD
41+
=======
42+
43+
44+
45+
>>>>>>> 3efa725c7f9aa48f686b139f530c814d74788f81
4046

4147
# --------------------
4248
# Many constants of these forms, documented in the Unix documentation on
@@ -703,7 +709,7 @@ if sys.version_info >= (3, 12):
703709
SOL_L2CAP: Final[int]
704710
SOL_RFCOMM: Final[int]
705711
SOL_SCO: Final[int]
706-
712+
707713
# --------------------
708714
# Semi-documented constants
709715
BDADDR_BREDR: Final[int]

0 commit comments

Comments
 (0)