D5099: notify: adapt to new location of email module's errors

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Sun Oct 14 09:40:38 UTC 2018


durin42 created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5099

AFFECTED FILES
  hgext/notify.py

CHANGE DETAILS

diff --git a/hgext/notify.py b/hgext/notify.py
--- a/hgext/notify.py
+++ b/hgext/notify.py
@@ -153,14 +153,20 @@
     logcmdutil,
     mail,
     patch,
+    pycompat,
     registrar,
     util,
 )
 from mercurial.utils import (
     dateutil,
     stringutil,
 )
 
+if pycompat.ispy3:
+    import email.errors as emailerrors
+else:
+    emailerrors = email.Errors
+
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
@@ -362,7 +368,7 @@
         p = emailparser.Parser()
         try:
             msg = p.parsestr(data)
-        except email.Errors.MessageParseError as inst:
+        except emailerrors.MessageParseError as inst:
             raise error.Abort(inst)
 
         # store sender and subject



To: durin42, #hg-reviewers
Cc: mjpieters, mercurial-devel


More information about the Mercurial-devel mailing list