File tree Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -573,10 +573,13 @@ def hack_project_files(
573
573
rb'<ClCompile Include="$(opensslIncludeDir)\openssl\applink.c">' ,
574
574
)
575
575
576
- # We're still on the pre-built tk-windows-bin 8.6.12 which doesn't have a
577
- # standalone zlib DLL. So remove references to it from 3.12+.
578
- # On 3.14, something changed
579
- if meets_python_minimum_version (python_version , "3.12" ) and meets_python_maximum_version (python_version , "3.13" ):
576
+ # Python 3.12+ uses the the pre-built tk-windows-bin 8.6.12 which doesn't
577
+ # have a standalone zlib DLL, so we remove references to it. For Python
578
+ # 3.14+, we're using tk-windows-bin 8.6.14 which includes a prebuilt zlib
579
+ # DLL, so we skip this patch there.
580
+ if meets_python_minimum_version (
581
+ python_version , "3.12"
582
+ ) and meets_python_maximum_version (python_version , "3.13" ):
580
583
static_replace_in_file (
581
584
pcbuild_path / "_tkinter.vcxproj" ,
582
585
rb'<_TclTkDLL Include="$(tcltkdir)\bin\$(tclZlibDllName)" />' ,
Original file line number Diff line number Diff line change @@ -798,6 +798,8 @@ const GLOBAL_EXTENSIONS_WINDOWS: &[&str] = &[
798
798
"winsound" ,
799
799
] ;
800
800
801
+ const GLOBAL_EXTENSIONS_WINDOWS_3_14 : & [ & str ] = & [ "_wmi" ] ;
802
+
801
803
const GLOBAL_EXTENSIONS_WINDOWS_PRE_3_13 : & [ & str ] = & [ "_msi" ] ;
802
804
803
805
/// Extension modules not present in Windows static builds.
@@ -1542,6 +1544,10 @@ fn validate_extension_modules(
1542
1544
wanted. extend ( GLOBAL_EXTENSIONS_WINDOWS_PRE_3_13 ) ;
1543
1545
}
1544
1546
1547
+ if matches ! ( python_major_minor, "3.14" ) {
1548
+ wanted. extend ( GLOBAL_EXTENSIONS_WINDOWS_3_14 ) ;
1549
+ }
1550
+
1545
1551
if static_crt {
1546
1552
for x in GLOBAL_EXTENSIONS_WINDOWS_NO_STATIC {
1547
1553
wanted. remove ( * x) ;
You can’t perform that action at this time.
0 commit comments