filter/source/config/tools/merge/pyAltFCFGMerge | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 0eb2e80162304a291643238b8763b67d73c36dc8 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Sep 22 14:53:10 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Sep 23 12:07:05 2025 +0200 Fix Python codecs.open deprecation warning ...seen at least with --with-system-python against python3-3.14.0~rc3-1.fc43.x86_64, causing e.g. > [FIF] fcfg_database_filters.xcu > Traceback (most recent call last): > File "/home/sberg/lo-plain/core/filter/source/config/tools/merge/pyAltFCFGMerge", line 571, in getFragments > aFragmentFile = codecs.open(sFragPath, "r", "utf-8") > File "<frozen codecs>", line 916, in open > DeprecationWarning: codecs.open() is deprecated. Use open() instead. > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File "/home/sberg/lo-plain/core/filter/source/config/tools/merge/pyAltFCFGMerge", line 588, in <module> > run(sys.argv) > ~~~^^^^^^^^^^ > File "/home/sberg/lo-plain/core/filter/source/config/tools/merge/pyAltFCFGMerge", line 290, in run > aMerger.merge() > ~~~~~~~~~~~~~^^ > File "/home/sberg/lo-plain/core/filter/source/config/tools/merge/pyAltFCFGMerge", line 529, in merge > sBuffer = sBuffer + self.getFragments(\ > ~~~~~~~~~~~~~~~~~^^ > os.path.join(self.m_aFragmentsDir, sSubDir), \ > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > sSetName, lFragments, 1) > ^^^^^^^^^^^^^^^^^^^^^^^^ > File "/home/sberg/lo-plain/core/filter/source/config/tools/merge/pyAltFCFGMerge", line 574, in getFragments > raise Exception("fragment \"" + sFragPath + "\" does not exists.") > Exception: fragment "/home/sberg/lo-plain/core/filter/source/config/fragments/filters/../filters/StarOffice_XML__Base_.xcu" does not exists. > make: *** [/home/sberg/lo-plain/core/filter/Configuration_filter.mk:81: /home/sberg/lo-plain/core/workdir/XcuFilterFiltersTarget/fcfg_database_filters.xcu] Error 1 to fail Change-Id: I7de0459ff509009e3bc8afd803003a24b8fdaf41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191349 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit d4ecccbddc1383b44f9c3447410e92c658e4dda3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191355 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index 6f02453ed364..10da5204907e 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -9,7 +9,7 @@ # there is a java which is available for use by all #_____________________________________________ -import sys, os.path, codecs +import sys, os.path CFGFILE = os.environ["SRCDIR"] + "/filter/source/config/tools/merge/FCFGMerge.cfg" @@ -543,7 +543,7 @@ class Merger: return printOut("package contains " + str(nItemCount) + " items") - aPackage = codecs.open(sPackage, 'w', "utf-8") + aPackage = open(sPackage, 'w', encoding = "utf-8") printOut("write temp package \"" + sPackage) aPackage.write(sBuffer) aPackage.close() @@ -568,7 +568,7 @@ class Merger: for sFragment in lFragments: sFragPath = os.path.join(aDir, sFragment + "." + sExtXcu) try: - aFragmentFile = codecs.open(sFragPath, "r", "utf-8") + aFragmentFile = open(sFragPath, encoding = "utf-8") except: # handle simple files only and check for existence! raise Exception("fragment \"" + sFragPath + "\" does not exists.")
