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


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.15.x@1933232 13f79535-47bb-0310-9956-ffa450edef68

Author: svn-role

STATUS

@@ -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

subversion/tests/cmdline/svntest/main.py

@@ -784,7 +784,7 @@ def trust_ssl_cert(cfgdir, ssl_cert, ssl_url):
   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