Mercurial > hg-stable

changeset 29501:be68a4445041

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jul 2016 08:54:13 -0500
parents 4b16a5bd9948 (current diff) a7d1532b26a1 (diff)
children 8361131b4768
files mercurial/sslutil.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/sslutil.py	Wed Jul 06 21:16:00 2016 -0700
+++ b/mercurial/sslutil.py	Mon Jul 11 08:54:13 2016 -0500
@@ -384,7 +384,7 @@
                 if _dnsnamematch(value, hostname):
                     return
             except wildcarderror as e:
-                return e.message
+                return e.args[0]
 
             dnsnames.append(value)
 
@@ -405,7 +405,7 @@
                         if _dnsnamematch(value, hostname):
                             return
                     except wildcarderror as e:
-                        return e.message
+                        return e.args[0]
 
                     dnsnames.append(value)