[PATCH 2 of 2] py3: convert unicode paths given for hgweb config

Ludovic Chabant ludovic at chabant.com
Fri Apr 19 10:34:14 EDT 2019


# HG changeset patch
# User Ludovic Chabant <ludovic at chabant.com>
# Date 1555683992 0
#      Fri Apr 19 14:26:32 2019 +0000
# Branch stable
# Node ID b1baf28288faf3fd628d5104211e1482e77bdf39
# Parent  96a51193678400abf9d04af65e60a8dccf540cd7
py3: convert unicode paths given for hgweb config

diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py
--- a/mercurial/hgweb/__init__.py
+++ b/mercurial/hgweb/__init__.py
@@ -38,6 +38,8 @@
     - list of virtual:real tuples (multi-repo view)
     '''
 
+    if isinstance(config, str):
+        config = config.encode()
     if ((isinstance(config, bytes) and not os.path.isdir(config)) or
         isinstance(config, dict) or isinstance(config, list)):
         # create a multi-dir interface


More information about the Mercurial-devel mailing list