Author: svn-role Date: Mon Nov 7 04:00:02 2022 New Revision: 1905107 URL: http://svn.apache.org/viewvc?rev=1905107&view=rev Log: Merge r1900882 from trunk:
* r1900882 SVN-4899: Replace a call to a function deprecated upstream. Justification: No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be built by future Python 3.12. Note that Python 3.2 was released 9 years before Subversion 1.14.0. Votes: +1: danielsh, jamessan -0: futatuki (This breaks Python 2.7 support; +1 if r1900890 (see below) is also backported) Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/build/generator/gen_base.py Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1900882 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905107&r1=1905106&r2=1905107&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:02 2022 @@ -64,17 +64,6 @@ Veto-blocked changes: Approved changes: ================= - * r1900882 - SVN-4899: Replace a call to a function deprecated upstream. - Justification: - No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be - built by future Python 3.12. Note that Python 3.2 was released 9 years - before Subversion 1.14.0. - Votes: - +1: danielsh, jamessan - -0: futatuki (This breaks Python 2.7 support; - +1 if r1900890 (see below) is also backported) - * r1900890 Follow up to r1900882: Restore Python 2.7 support on autogen.sh Justification: @@ -114,4 +103,3 @@ Approved changes: environment when users use release tar balls. Votes: +1: futatuki, stsp, jamessan - Modified: subversion/branches/1.14.x/build/generator/gen_base.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_base.py?rev=1905107&r1=1905106&r2=1905107&view=diff ============================================================================== --- subversion/branches/1.14.x/build/generator/gen_base.py (original) +++ subversion/branches/1.14.x/build/generator/gen_base.py Mon Nov 7 04:00:02 2022 @@ -76,7 +76,7 @@ class GeneratorBase: # Now read and parse build.conf parser = configparser.ConfigParser() - parser.readfp(open(fname)) + parser.read_file(open(fname)) self.conf = build_path(os.path.abspath(fname))