Author: svn-role
Date: Mon Nov 7 04:00:04 2022
New Revision: 1905108
URL: http://svn.apache.org/viewvc?rev=1905108&view=rev
Log:
Merge r1900890 from trunk:
* r1900890
Follow up to r1900882: Restore Python 2.7 support on autogen.sh
Justification:
autogen.sh is need to build SWIG Python 2 bindings.
We have not actively dropped Python 2.7 support, at least on 1.14.x.
Depends:
r1900882
Votes:
+1: futatuki, jun66j5, jamessan
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:r1900890
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905108&r1=1905107&r2=1905108&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:04 2022
@@ -64,16 +64,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1900890
- Follow up to r1900882: Restore Python 2.7 support on autogen.sh
- Justification:
- autogen.sh is need to build SWIG Python 2 bindings.
- We have not actively dropped Python 2.7 support, at least on 1.14.x.
- Depends:
- r1900882
- Votes:
- +1: futatuki, jun66j5, jamessan
-
* r1904193
SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t
Justification:
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=1905108&r1=1905107&r2=1905108&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:04
2022
@@ -35,6 +35,7 @@ try:
except ImportError:
# Python <3.0
import ConfigParser as configparser
+ configparser.ConfigParser.read_file = configparser.ConfigParser.readfp
import generator.swig
import getversion
