[Jython-checkins] jython: Minor fixups for cert parsing

[jim.baker]

https://hg.python.org/jython/rev/39d27fa93f24
changeset:   7834:39d27fa93f24
user:        Jim Baker <jim.baker at rackspace.com>
date:        Thu Dec 10 23:14:56 2015 -0700
summary:
  Minor fixups for cert parsing

files:
  Lib/ssl.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -152,6 +152,8 @@
         return s.encode('ascii')
     except UnicodeEncodeError:
         return s
+    except AttributeError:
+        return str(s)
 
 class CertificateError(ValueError):
     pass
@@ -655,7 +657,7 @@
             return {}
 
         dn = cert.getSubjectX500Principal().getName()
-        rdns = self._parse_dn(dn)
+        rdns = SSLContext._parse_dn(dn)
         alt_names = tuple()
         if cert.getSubjectAlternativeNames():
             alt_names = tuple(((_cert_name_types[type], str(name)) for (type, name) in cert.getSubjectAlternativeNames()))

-- 
Repository URL: https://hg.python.org/jython