Author: svn-role
Date: Wed Dec 4 04:00:08 2019
New Revision: 1870783
URL: http://svn.apache.org/viewvc?rev=1870783&view=rev
Log:
Merge r1868151 from trunk:
* r1868151
Fix syntax error when $PYTHON is Python 3.
Justification:
Python 2 will reach EOL during the lifetime of this branch.
Votes:
+1: danielsh, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1868151
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1870783&r1=1870782&r2=1870783&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Dec 4 04:00:08 2019
@@ -27,11 +27,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1868151
- Fix syntax error when $PYTHON is Python 3.
- Justification:
- Python 2 will reach EOL during the lifetime of this branch.
- Votes:
- +1: danielsh, jamessan
-
Modified:
subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh?rev=1870783&r1=1870782&r2=1870783&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/svnserveautocheck.sh
Wed Dec 4 04:00:08 2019
@@ -104,7 +104,7 @@ random_port() {
if [ -n "$BASH_VERSION" ]; then
echo $(($RANDOM+1024))
else
- $PYTHON -c 'import random; print random.randint(1024, 2**16-1)'
+ $PYTHON -c 'import random; print(random.randint(1024, 2**16-1))'
fi
}
