tools: Rename a local function.
* tools/client-side/store-plaintext-password.py
(svn_hash_read): Rename to…
(hash_read): … this.
(main): Update callers.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1903311 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/client-side/store-plaintext-password.py b/tools/client-side/store-plaintext-password.py
index 9319e1a..be7d068 100755
--- a/tools/client-side/store-plaintext-password.py
+++ b/tools/client-side/store-plaintext-password.py
@@ -76,7 +76,9 @@
return datum
-def svn_hash_read(fd):
+# Our version of svn_hash_read2(), named without "svn_" prefix to avoid
+# potential naming conflicts with stuff star-imported from svn.core.
+def hash_read(fd):
"""\
Read an svn_hash_write2()-formatted file from FD, terminated by "END".
@@ -165,7 +167,7 @@
# In an existing file, we add/replace password/username/passtype
if existingFile:
- hash = svn_hash_read(open(authfileName, 'rb'))
+ hash = hash_read(open(authfileName, 'rb'))
if args.user is not None:
hash[b'username'] = args.user.encode('utf-8')
hash[b'password'] = password.encode('utf-8')
