From 1b3b3ce19d76ef3d1d492db6d85fd2df52781e2c Mon Sep 17 00:00:00 2001 From: Brendan McCollam Date: Tue, 25 Aug 2015 10:55:44 -0500 Subject: Adds _name property to ObjectIdentifier --- src/cryptography/x509/oid.py | 6 +++++- tests/test_x509.py | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index 9fabab72..ead40169 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -24,12 +24,16 @@ class ObjectIdentifier(object): def __repr__(self): return "".format( self.dotted_string, - _OID_NAMES.get(self, "Unknown OID") + self._name ) def __hash__(self): return hash(self.dotted_string) + @property + def _name(self): + return _OID_NAMES.get(self, "Unknown OID") + dotted_string = utils.read_only_property("_dotted_string") diff --git a/tests/test_x509.py b/tests/test_x509.py index b7602d18..220e71a5 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -2436,6 +2436,12 @@ class TestObjectIdentifier(object): oid = x509.ObjectIdentifier("oid1") assert repr(oid) == "" + def test_name_property(self): + oid = x509.ObjectIdentifier("2.5.4.3") + assert oid._name == 'commonName' + oid = x509.ObjectIdentifier("oid1") + assert oid._name == 'Unknown OID' + class TestName(object): def test_eq(self): -- cgit v1.2.3