aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-08 15:00:34 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-08 15:00:34 -0500
commit948ba5d4ff4ee7a8f7554af123e97ab580aa50a2 (patch)
tree70004a36b926fa4f187bc02d185aab27e4cbc17c /src
parent786ded65fd2f7a2ef851e9f6f132f5fc5bc962d9 (diff)
parentae454130b0bbdbb60e9d2081eca6d181eb6fa686 (diff)
downloadcryptography-948ba5d4ff4ee7a8f7554af123e97ab580aa50a2.tar.gz
cryptography-948ba5d4ff4ee7a8f7554af123e97ab580aa50a2.tar.bz2
cryptography-948ba5d4ff4ee7a8f7554af123e97ab580aa50a2.zip
Merge pull request #2294 from bjmc/add_name_to_oids
Adds name property to ObjectIdentifier
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509/oid.py6
1 files changed, 5 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")