[PATCH] dispatch: don't attempt to import debugger as bytestring

Jordi Gutiérrez Hermoso jordigh at octave.org
Fri Jun 18 19:36:31 UTC 2021


# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh at octave.org>
# Date 1624044920 14400
#      Fri Jun 18 15:35:20 2021 -0400
# Node ID 81654997cf8607f9c4a76df25072f265fc0c6b48
# Parent  0ef8231e413f5fec7298ca8f529a003ac3967a80
dispatch: don't attempt to import debugger as bytestring

The __import__ thingie needs a string, not a bytestring. Guess I'm the
only one who uses this once in a while and noticed it was broken.

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -427,7 +427,7 @@ def _runcatch(req):
                     # debugging has been requested
                     with demandimport.deactivated():
                         try:
-                            debugmod = __import__(debugger)
+                            debugmod = __import__(pycompat.sysstr(debugger))
                         except ImportError:
                             pass  # Leave debugmod = pdb
 


More information about the Mercurial-devel mailing list