Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hooklib: force an exception wrapped by errors.Abort to bytestr
authorMatt Harbison <matt_harbison@yahoo.com>
Fri, 06 Jan 2023 00:05:14 -0500
changeset 49865 5392bf258049
parent 49864 5f006f789373
child 49866 2ac60a71c240
hooklib: force an exception wrapped by errors.Abort to bytestr Flagged by PyCharm and pytype.
hgext/hooklib/changeset_obsoleted.py file | annotate | diff | comparison | revisions
hgext/hooklib/changeset_published.py file | annotate | diff | comparison | revisions 
--- a/hgext/hooklib/changeset_obsoleted.py	Fri Jan 06 00:04:46 2023 -0500
+++ b/hgext/hooklib/changeset_obsoleted.py	Fri Jan 06 00:05:14 2023 -0500
@@ -32,7 +32,10 @@
     pycompat,
     registrar,
 )
-from mercurial.utils import dateutil
+from mercurial.utils import (
+    dateutil,
+    stringutil,
+)
 from .. import notify
 
 configtable = {}
@@ -98,7 +101,7 @@
     try:
         msg = mail.parsebytes(data)
     except emailerrors.MessageParseError as inst:
-        raise error.Abort(inst)
+        raise error.Abort(stringutil.forcebytestr(inst))
 
     msg['In-reply-to'] = notify.messageid(ctx, domain, messageidseed)
     msg['Message-Id'] = notify.messageid(
--- a/hgext/hooklib/changeset_published.py	Fri Jan 06 00:04:46 2023 -0500
+++ b/hgext/hooklib/changeset_published.py	Fri Jan 06 00:05:14 2023 -0500
@@ -31,7 +31,10 @@
     pycompat,
     registrar,
 )
-from mercurial.utils import dateutil
+from mercurial.utils import (
+    dateutil,
+    stringutil,
+)
 from .. import notify
 
 configtable = {}
@@ -97,7 +100,7 @@
     try:
         msg = mail.parsebytes(data)
     except emailerrors.MessageParseError as inst:
-        raise error.Abort(inst)
+        raise error.Abort(stringutil.forcebytestr(inst))
 
     msg['In-reply-to'] = notify.messageid(ctx, domain, messageidseed)
     msg['Message-Id'] = notify.messageid(
mercurial