Submitter | Gregory Szorc |
---|---|
Date | July 2, 2016, 4:42 p.m. |
Message ID | <d52f1b12afc3c3d2107d.1467477777@ubuntu-vm-main> |
Download | mbox | patch |
Permalink | /patch/15724/ |
State | Accepted |
Delegated to: | Yuya Nishihara |
Headers | show |
Comments
On Sat, 02 Jul 2016 09:42:57 -0700, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc <gregory.szorc@gmail.com> > # Date 1467477700 25200 > # Sat Jul 02 09:41:40 2016 -0700 > # Branch stable > # Node ID d52f1b12afc3c3d2107d45a3113af62c12182102 > # Parent ddbff1435e7baf66efc67c4d2a733f8035cd53d8 > sslutil: don't access message attribute in exception (issue5285) Queued for stable, thanks. > except wildcarderror as e: > - return e.message > + return e.args[0] Nit for the previous patch: our coding style says exception classes are CamelCased. https://www.mercurial-scm.org/wiki/CodingStyle#Classes
Patch
diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py --- a/mercurial/sslutil.py +++ b/mercurial/sslutil.py @@ -231,17 +231,17 @@ def _verifycert(cert, hostname): dnsnames = [] san = cert.get('subjectAltName', []) for key, value in san: if key == 'DNS': try: if _dnsnamematch(value, hostname): return except wildcarderror as e: - return e.message + return e.args[0] dnsnames.append(value) if not dnsnames: # The subject is only checked when there is no DNS in subjectAltName. for sub in cert.get('subject', []): for key, value in sub: # According to RFC 2818 the most specific Common Name must @@ -252,17 +252,17 @@ def _verifycert(cert, hostname): value = value.encode('ascii') except UnicodeEncodeError: return _('IDN in certificate not supported') try: if _dnsnamematch(value, hostname): return except wildcarderror as e: - return e.message + return e.args[0] dnsnames.append(value) if len(dnsnames) > 1: return _('certificate is for %s') % ', '.join(dnsnames) elif len(dnsnames) == 1: return _('certificate is for %s') % dnsnames[0] else: