Author: danielsh Date: Wed Jan 26 12:34:42 2022 New Revision: 1897503 URL: http://svn.apache.org/viewvc?rev=1897503&view=rev Log: Follow-up to r1897452: Fix 'make check' under Python 3.
Found by: julianfoad * subversion/tests/cmdline/svntest/main.py (run_command_stdin): Don't refer to 'unicode' under Python 3. Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1897503&r1=1897502&r2=1897503&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed Jan 26 12:34:42 2022 @@ -616,7 +616,12 @@ def run_command_stdin(command, error_exp start = time.time() - assert all(isinstance(arg, (str, unicode, int)) for arg in varargs) + if sys.version_info >= (3, 0): + # Don't include 'bytes' since spawn_process() would raise. + assert all(isinstance(arg, (str, int)) for arg in varargs) + else: + # Include 'unicode' since svnrdump_tests pass b''.decode(). + assert all(isinstance(arg, (str, unicode, int)) for arg in varargs) exit_code, stdout_lines, stderr_lines = spawn_process(command, bufsize,