Author: svn-role
Date: Wed Apr 22 04:00:11 2026
New Revision: 1933232
Log:
Merge r1931266 from trunk:
* r1931266
In Python 3, hashlib input data must be byte strings, not Unicode.
Justification:
Allow testing with davautocheck with SSL
Votes:
+0: hartmannathan
+1: jun66j5, brane, dsahlberg
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/subversion/tests/cmdline/svntest/main.py
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Wed Apr 22 03:11:51 2026
(r1933231)
+++ subversion/branches/1.15.x/STATUS Wed Apr 22 04:00:11 2026
(r1933232)
@@ -39,11 +39,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1931266
- In Python 3, hashlib input data must be byte strings, not Unicode.
- Justification:
- Allow testing with davautocheck with SSL
- Votes:
- +0: hartmannathan
- +1: jun66j5, brane, dsahlberg
Modified: subversion/branches/1.15.x/subversion/tests/cmdline/svntest/main.py
==============================================================================
--- subversion/branches/1.15.x/subversion/tests/cmdline/svntest/main.py Wed Apr
22 03:11:51 2026 (r1933231)
+++ subversion/branches/1.15.x/subversion/tests/cmdline/svntest/main.py Wed Apr
22 04:00:11 2026 (r1933232)
@@ -784,7 +784,7 @@ def trust_ssl_cert(cfgdir, ssl_cert, ssl
ssl_dir = os.path.join(cfgdir, 'auth', 'svn.ssl.server')
if not os.path.isdir(ssl_dir):
os.makedirs(ssl_dir)
- md5_name = hashlib.md5(netloc_url).hexdigest()
+ md5_name = hashlib.md5(netloc_url.encode()).hexdigest()
md5_file = os.path.join(ssl_dir, md5_name)
md5_file_contents = """K 10
ascii_cert
