commit a9a5117f9aae4f0aa3e2e1bd3dcd6a93867c67a4
author Andre Caron <andre.l.caron@gmail.com> Sat Jun 06 20:18:44 2015 -0400
committer Ian Cordasco <graffatcolmingov@gmail.com> Wed Jun 24 13:35:49 2015 -0500
tree 0dd0e8d51b43f03e1042c73328d6d51aed57be81
parent 24f9bf4ba52c64f10ea6895a7e37dd0b4761b589

Removes set_ prefix on CSR builder method.

docs/x509.rst

diff --git a/docs/x509.rst b/docs/x509.rst
index d7ab647..0f55e8e 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -487,7 +487,7 @@
         ...     backend=default_backend()
         ... )
         >>> builder = x509.CertificateSigningRequestBuilder()
-        >>> builder = builder.set_subject_name(x509.Name([
+        >>> builder = builder.subject_name(x509.Name([
         ...     x509.NameAttribute(x509.OID_COMMON_NAME, 'cryptography.io'),
         ... ]))
         >>> buidlder = builder.add_extension(
@@ -503,7 +503,7 @@
 
         Creates an empty certificate signing request.
 
-    .. method:: set_subject_name(name)
+    .. method:: subject_name(name)
 
         :param name: The :class:`~cryptography.x509.Name` of the certificate
             subject.

src/cryptography/x509.py

diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index f518b68..ab4f3c7 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -1452,7 +1452,7 @@
         self._subject_name = subject_name
         self._extensions = extensions[:]
 
-    def set_subject_name(self, name):
+    def subject_name(self, name):
         """
         Sets the certificate requestor's distinguished name.
         """

tests/test_x509.py

diff --git a/tests/test_x509.py b/tests/test_x509.py
index 663b83b..150eb6f 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -699,7 +699,7 @@
             backend=backend,
         )
 
-        request = x509.CertificateSigningRequestBuilder().set_subject_name(
+        request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
                 x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'),
                 x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'),
@@ -738,7 +738,7 @@
             backend=backend,
         )
 
-        request = x509.CertificateSigningRequestBuilder().set_subject_name(
+        request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
                 x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'),
                 x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'),
@@ -782,7 +782,7 @@
     def test_set_invalid_subject(self, backend):
         builder = x509.CertificateSigningRequestBuilder()
         with pytest.raises(TypeError):
-            builder.set_subject_name('NotAName')
+            builder.subject_name('NotAName')
 
     def test_add_unsupported_extension(self, backend):
         private_key = rsa.generate_private_key(
@@ -790,7 +790,7 @@
             key_size=2048,
             backend=backend,
         )
-        builder = x509.CertificateSigningRequestBuilder().set_subject_name(
+        builder = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
                 x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
                 x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),