Author: dsahlberg
Date: Wed Nov 20 17:04:20 2024
New Revision: 1921976
URL: http://svn.apache.org/viewvc?rev=1921976&view=rev
Log:
Make backport_tests work with Python 3
* backport_tests.py
(wrapped_test_func): Python 3 uses __name__ attribute for function name
* backport_tests_pl.py
(__main__): Replace execfile with Python3 equivalent
* backport_tests_pl.py
(__main__): Replace execfile with Python3 equivalent
Modified:
subversion/trunk/tools/dist/backport_tests.py
subversion/trunk/tools/dist/backport_tests_pl.py
subversion/trunk/tools/dist/backport_tests_py.py
Modified: subversion/trunk/tools/dist/backport_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests.py?rev=1921976&r1=1921975&r2=1921976&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport_tests.py (original)
+++ subversion/trunk/tools/dist/backport_tests.py Wed Nov 20 17:04:20 2024
@@ -101,7 +101,7 @@ class BackportTest(object):
# .wraps() propagates the wrappee's docstring to the wrapper.
@functools.wraps(test_func)
def wrapped_test_func(sbox):
- expected_dump_file = './backport_tests_data/%s.dump' %
(test_func.func_name,)
+ expected_dump_file = './backport_tests_data/%s.dump' %
(test_func.__name__,)
sbox.build()
Modified: subversion/trunk/tools/dist/backport_tests_pl.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests_pl.py?rev=1921976&r1=1921975&r2=1921976&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport_tests_pl.py (original)
+++ subversion/trunk/tools/dist/backport_tests_pl.py Wed Nov 20 17:04:20 2024
@@ -50,4 +50,5 @@ def run_conflicter(sbox, error_expected=
return run_backport(sbox, error_expected, ["MAY_COMMIT=0"])
-execfile("backport_tests.py")
+with open("backport_tests.py", "rb") as file:
+ exec(compile(file.read(), "backport_tests.py", "exec"))
Modified: subversion/trunk/tools/dist/backport_tests_py.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests_py.py?rev=1921976&r1=1921975&r2=1921976&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport_tests_py.py (original)
+++ subversion/trunk/tools/dist/backport_tests_py.py Wed Nov 20 17:04:20 2024
@@ -51,4 +51,5 @@ def run_conflicter(sbox, error_expected=
with chdir(sbox.ospath('branch')):
return svntest.main.run_command(args[0], error_expected, False,
*(args[1:]))
-execfile("backport_tests.py")
+with open("backport_tests.py", "rb") as file:
+ exec(compile(file.read(), "backport_tests.py", "exec"))
