From 02df4ccedb3c3ba326022bfcd71149a4d50c008f Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Sun, 13 Mar 2016 14:46:28 +0000 Subject: [PATCH] Make uuid generation portable between python 2.7 and python 3 (at least for ascii branch names). Copied from Perforce Change: 189971 ServerID: perforce.ravenbrook.com --- mps/tool/branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mps/tool/branch b/mps/tool/branch index 7de38f08d29..c8456ea3362 100755 --- a/mps/tool/branch +++ b/mps/tool/branch @@ -276,7 +276,7 @@ def main(argv): # Invent a UUID to use as the section title for the branch in # the Git Fusion configuration files. - args.uuid = uuid.uuid5(uuid.NAMESPACE_URL, args.child.encode('utf7')) + args.uuid = uuid.uuid5(uuid.NAMESPACE_URL, str(args.child)) print(fmt("uuid={uuid}")) for repo in GF_REPOS: