From 1fb35c9e0dc716571dca894075c59f3ed60f47f3 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 11 Apr 2015 15:42:54 -0400 Subject: add repr for x509 names --- src/cryptography/x509.py | 3 +++ tests/test_x509.py | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index 28d16853..b3f889e5 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -190,6 +190,9 @@ class Name(object): def __len__(self): return len(self._attributes) + def __repr__(self): + return repr(self._attributes) + OID_SUBJECT_DIRECTORY_ATTRIBUTES = ObjectIdentifier("2.5.29.9") OID_SUBJECT_KEY_IDENTIFIER = ObjectIdentifier("2.5.29.14") diff --git a/tests/test_x509.py b/tests/test_x509.py index dc148d9d..7e7d4dd9 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -607,3 +607,15 @@ class TestName(object): ]) assert name1 != name2 assert name1 != object() + + def test_repr(self): + name = x509.Name([ + x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'), + x509.NameAttribute(x509.OID_ORGANIZATION_NAME, 'PyCA'), + ]) + + assert repr(name) == ( + "[, value='cryptography.io')>, , value='PyCA')>]" + ) -- cgit v1.2.3 From e613e5d8d922d7617409b878b3c2450eb9d21877 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 11 Apr 2015 15:52:04 -0400 Subject: let's make that repr actually good --- src/cryptography/x509.py | 2 +- tests/test_x509.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index b3f889e5..a50c0555 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -191,7 +191,7 @@ class Name(object): return len(self._attributes) def __repr__(self): - return repr(self._attributes) + return "".format(self._attributes) OID_SUBJECT_DIRECTORY_ATTRIBUTES = ObjectIdentifier("2.5.29.9") diff --git a/tests/test_x509.py b/tests/test_x509.py index 7e7d4dd9..d8a4cc02 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -615,7 +615,8 @@ class TestName(object): ]) assert repr(name) == ( - "[, value='cryptography.io')>, , value='PyCA')>]" + ", value='cryptography.io')>, , value='PyCA')>])" + ">" ) -- cgit v1.2.3 From f4ed10afd78fcd013ed17fd9305f33f07c4a6e7b Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 11 Apr 2015 15:53:12 -0400 Subject: 0!r time --- src/cryptography/x509.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index a50c0555..8554aeab 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -191,7 +191,7 @@ class Name(object): return len(self._attributes) def __repr__(self): - return "".format(self._attributes) + return "".format(self._attributes) OID_SUBJECT_DIRECTORY_ATTRIBUTES = ObjectIdentifier("2.5.29.9") -- cgit v1.2.3