Author: jerenkrantz
Date: Tue Mar 31 13:30:18 2020
New Revision: 1875933
URL: http://svn.apache.org/viewvc?rev=1875933&view=rev
Log:
Backport build changes to support Python 3.x.
* build/check.py: Backport r1833223 to add parentheses around 'print' statement.
* SConstruct: Backport r1814604 and r1811083 to add parentheses around 'print'
and decode file contents as 'utf-8'..
Reviewed by: astieger, rhujiben
Modified:
serf/branches/1.3.x/SConstruct
serf/branches/1.3.x/STATUS
serf/branches/1.3.x/build/check.py
Modified: serf/branches/1.3.x/SConstruct
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/SConstruct?rev=1875933&r1=1875932&r2=1875933&view=diff
==============================================================================
--- serf/branches/1.3.x/SConstruct (original)
+++ serf/branches/1.3.x/SConstruct Tue Mar 31 13:30:18 2020
@@ -166,7 +166,7 @@ env.Append(BUILDERS = {
match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
'SERF_MINOR_VERSION ([0-9]+).*'
'SERF_PATCH_VERSION ([0-9]+)',
- env.File('serf.h').get_contents(),
+ env.File('serf.h').get_contents().decode('utf-8'),
re.DOTALL)
MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
env.Append(MAJOR=str(MAJOR))
@@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean
unknown = opts.UnknownVariables()
if unknown:
- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
+ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
apr = str(env['APR'])
apu = str(env['APU'])
Modified: serf/branches/1.3.x/STATUS
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/STATUS?rev=1875933&r1=1875932&r2=1875933&view=diff
==============================================================================
--- serf/branches/1.3.x/STATUS (original)
+++ serf/branches/1.3.x/STATUS Tue Mar 31 13:30:18 2020
@@ -24,11 +24,6 @@ Candidate changes:
Votes:
+1: rhuijben, astieger
- * r1811083
- Make the SCons script compatible with SCons 3.0.0.
- Votes:
- +1: rhuijben, astieger
-
* r1814714
Support building against OpenSSL 1.1.0 on Windows
Justification:
@@ -38,11 +33,6 @@ Candidate changes:
Votes:
+1: rhuijben, astieger
- * r1814604
- Make SCons script work with scons 3.0.0 when built with Python 3
- Votes:
- +1: astieger, rhuijben
-
Veto-blocked changes:
=====================
Modified: serf/branches/1.3.x/build/check.py
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/build/check.py?rev=1875933&r1=1875932&r2=1875933&view=diff
==============================================================================
--- serf/branches/1.3.x/build/check.py (original)
+++ serf/branches/1.3.x/build/check.py Tue Mar 31 13:30:18 2020
@@ -52,16 +52,16 @@ if __name__ == '__main__':
# Find test responses and run them one by one
for case in glob.glob(testdir + "/testcases/*.response"):
- print "== Testing %s ==" % (case)
+ print("== Testing %s ==" % (case))
try:
subprocess.check_call([SERF_RESPONSE_EXE, case])
except subprocess.CalledProcessError:
- print "ERROR: test case %s failed" % (case)
+ print("ERROR: test case %s failed" % (case))
sys.exit(1)
- print "== Running the unit tests =="
+ print("== Running the unit tests ==")
try:
subprocess.check_call(TEST_ALL_EXE)
except subprocess.CalledProcessError:
- print "ERROR: test(s) failed in test_all"
+ print("ERROR: test(s) failed in test_all")
sys.exit(1)
