Mercurial > hg-stable

changeset 29460:a7d1532b26a1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sslutil: don't access message attribute in exception (issue5285) I should have ran the entire test suite on Python 2.6. Since the hostname matching tests are implemented in Python (not .t tests), it didn't uncover this warning. I'm not sure why - warnings should be printed regardless. This is possibly a bug in the test runner. But that's for another day...
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 02 Jul 2016 09:41:40 -0700
parents ddbff1435e7b
children be68a4445041 519bb4f9d3a4
files mercurial/sslutil.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/sslutil.py	Fri Jul 01 15:12:33 2016 -0500
+++ b/mercurial/sslutil.py	Sat Jul 02 09:41:40 2016 -0700
@@ -236,7 +236,7 @@
                 if _dnsnamematch(value, hostname):
                     return
             except wildcarderror as e:
-                return e.message
+                return e.args[0]
 
             dnsnames.append(value)
 
@@ -257,7 +257,7 @@
                         if _dnsnamematch(value, hostname):
                             return
                     except wildcarderror as e:
-                        return e.message
+                        return e.args[0]
 
                     dnsnames.append(value)