external/python3/ExternalPackage_python3.mk | 1 + external/python3/python-3.5.4-msvc-disable.patch.1 | 8 +------- pyuno/qa/pytests/testimports.py | 7 +++++++ 3 files changed, 9 insertions(+), 7 deletions(-)
New commits: commit 4bf59e9258651a5dae69ad1f25a6bb3435cbd160 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Oct 31 23:08:16 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Nov 3 15:27:55 2025 +0100 python3: bundle _hashlib on Windows too as Linux and MacOS already do Change-Id: I42aae48a35e72b540a7fda51bb5907de2de64aab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193288 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 40c63758aa9b..c46dbc056e2a 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -33,6 +33,7 @@ python3_EXTENSION_MODULES= \ PCbuild/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_elementtree$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_hashlib$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_msi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_multiprocessing$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_overlapped$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ diff --git a/external/python3/python-3.5.4-msvc-disable.patch.1 b/external/python3/python-3.5.4-msvc-disable.patch.1 index ad690eda39ff..4807706a5a07 100644 --- a/external/python3/python-3.5.4-msvc-disable.patch.1 +++ b/external/python3/python-3.5.4-msvc-disable.patch.1 @@ -24,7 +24,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln {FDB84CBB-2FB6-47C8-A2D6-091E0833239D} = {FDB84CBB-2FB6-47C8-A2D6-091E0833239D} {73FCD2BD-F133-46B7-8EC1-144CD82A59D5} = {73FCD2BD-F133-46B7-8EC1-144CD82A59D5} {2097F1C1-597C-4167-93E3-656A7D6339B2} = {2097F1C1-597C-4167-93E3-656A7D6339B2} -@@ -75,20 +75,14 @@ +@@ -85,14 +80,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testimportmultiple", "_testimportmultiple.vcxproj", "{36D0C52C-DF4E-45D0-8BC7-E294C3ABC781}" EndProject @@ -39,12 +39,6 @@ diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcxproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" @@ -139,8 +119,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_queue", "_queue.vcxproj", "{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}" diff --git a/pyuno/qa/pytests/testimports.py b/pyuno/qa/pytests/testimports.py index 32c8e42af280..05e709aa7c9c 100644 --- a/pyuno/qa/pytests/testimports.py +++ b/pyuno/qa/pytests/testimports.py @@ -54,5 +54,12 @@ class ImportsTest(unittest.TestCase): with open(os.devnull, "w") as devnull: print(str(dbm), file=devnull) + def test__hashlib_import(self): + import _hashlib + + # use imported _hashlib module for pyflakes + with open(os.devnull, "w") as devnull: + print(str(_hashlib), file=devnull) + if __name__ == '__main__': unittest.main()
