aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan McCollam <bmccollam@uchicago.edu>2015-08-25 10:55:44 -0500
committerBrendan McCollam <bmccollam@uchicago.edu>2015-09-06 15:00:18 -0500
commit1b3b3ce19d76ef3d1d492db6d85fd2df52781e2c (patch)
treea7ac44e9cb610b2be08be7263fcf5256f36823a5
parent26adb0fe0711e1763fed7e311f8840ee37d22a67 (diff)
downloadcryptography-1b3b3ce19d76ef3d1d492db6d85fd2df52781e2c.tar.gz
cryptography-1b3b3ce19d76ef3d1d492db6d85fd2df52781e2c.tar.bz2
cryptography-1b3b3ce19d76ef3d1d492db6d85fd2df52781e2c.zip
Adds _name property to ObjectIdentifier
-rw-r--r--src/cryptography/x509/oid.py6
-rw-r--r--tests/test_x509.py6
2 files changed, 11 insertions, 1 deletions
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 "<ObjectIdentifier(oid={0}, name={1})>".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) == "<ObjectIdentifier(oid=oid1, name=Unknown 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):