From 6e0049fded0a17a0a0a186211de8f6905c3ce937 Mon Sep 17 00:00:00 2001
From: Seth Schoen <schoen@eff.org>
Date: Fri, 20 Feb 2015 13:44:36 -0800
Subject: [PATCH] Some formatting cleanups

---
 letsencrypt/client/crypto_util.py            |  8 +++--
 letsencrypt/client/tests/crypto_util_test.py | 37 ++++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/letsencrypt/client/crypto_util.py b/letsencrypt/client/crypto_util.py
index f5b836e82..d3cc75d20 100644
--- a/letsencrypt/client/crypto_util.py
+++ b/letsencrypt/client/crypto_util.py
@@ -195,7 +195,9 @@ def get_cert_info(filename):
 def get_sans_from_csr(csr):
     """Get list of Subject Alternative Names from signing request.
 
-    :param str csr: Certificate Signing Request in PEM format
+    :param str csr: Certificate Signing Request in PEM format (must contain
+        one or more subjectAlternativeNames, or the function will fail,
+        raising ValueError)
 
     :returns: List of referenced subject alternative names
     :rtype: list
@@ -207,8 +209,8 @@ def get_sans_from_csr(csr):
     #       use of relevant OpenSSL or other X509-parsing APIs.
     req = M2Crypto.X509.load_request_string(csr)
     text = req.as_text().split("\n")
-    if len(text) < 2 or text[0] != "Certificate Request:" or \
-                        text[1] != "    Data:":
+    if (len(text) < 2 or text[0] != "Certificate Request:" or
+            text[1] != "    Data:"):
         raise ValueError("Unable to parse CSR")
     text = text[2:]
     while text and text[0] != "        Attributes:":
diff --git a/letsencrypt/client/tests/crypto_util_test.py b/letsencrypt/client/tests/crypto_util_test.py
index 13832d886..728d4a551 100644
--- a/letsencrypt/client/tests/crypto_util_test.py
+++ b/letsencrypt/client/tests/crypto_util_test.py
@@ -140,30 +140,28 @@ class GetSansFromCsrTest(unittest.TestCase):
         from letsencrypt.client.crypto_util import get_sans_from_csr
         csr = pkg_resources.resource_string(
             __name__, os.path.join('testdata', 'csr.pem'))
-        result = get_sans_from_csr(csr)
-        self.assertEqual(result, ['example.com'])
+        self.assertEqual(get_sans_from_csr(csr), ['example.com'])
 
     def test_extract_two_sans(self):
         from letsencrypt.client.crypto_util import get_sans_from_csr
         csr = pkg_resources.resource_string(
             __name__, os.path.join('testdata', 'csr-san.pem'))
-        result = get_sans_from_csr(csr)
-        self.assertEqual(result, ['example.com', 'www.example.com'])
+        self.assertEqual(get_sans_from_csr(csr), ['example.com',
+                                                  'www.example.com'])
 
     def test_extract_six_sans(self):
         from letsencrypt.client.crypto_util import get_sans_from_csr
         csr = pkg_resources.resource_string(
             __name__, os.path.join('testdata', 'csr-6sans.pem'))
-        result = get_sans_from_csr(csr)
-        self.assertEqual(
-            result, ["example.com", "example.org", "example.net",
-                     "example.info", "subdomain.example.com",
-                     "other.subdomain.example.com"])
+        self.assertEqual(get_sans_from_csr(csr),
+                         ["example.com", "example.org", "example.net",
+                          "example.info", "subdomain.example.com",
+                          "other.subdomain.example.com"])
 
     def test_parse_non_csr(self):
-        from M2Crypto.X509 import X509Error
         from letsencrypt.client.crypto_util import get_sans_from_csr
-        self.assertRaises(X509Error, get_sans_from_csr, "hello there")
+        self.assertRaises(M2Crypto.X509.X509Error, get_sans_from_csr,
+                          "hello there")
 
     def test_parse_no_sans(self):
         from letsencrypt.client.crypto_util import get_sans_from_csr
@@ -184,20 +182,21 @@ class GetSansFromCsrTest(unittest.TestCase):
 class MakeCSRTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
     """Tests for letsencrypt.client.crypto_util.make_csr."""
     def test_make_csr(self):
-        from letsencrypt.client.crypto_util import make_csr, get_sans_from_csr
+        from letsencrypt.client.crypto_util import get_sans_from_csr
+        from letsencrypt.client.crypto_util import make_csr
         result = make_csr(RSA512_KEY, ["example.com", "foo.example.com"])[0]
         self.assertEqual(
             get_sans_from_csr(result), ["example.com", "foo.example.com"])
         req = M2Crypto.X509.load_request_string(result)
-        subject = req.get_subject().as_text()
-        modulus = req.get_pubkey().get_modulus()
         self.assertEqual(
-            subject, "C=US, ST=Michigan, L=Ann Arbor, O=EFF, OU=University"
-                     " of Michigan, CN=example.com")
+            req.get_subject().as_text(),
+            "C=US, ST=Michigan, L=Ann Arbor, O=EFF, OU=University"
+            " of Michigan, CN=example.com")
         self.assertEqual(
-            modulus, "F4B61171513736BFAA95E79C11C5FC2705439E3786D57EEE72C0"
-                     "9AB2EB993347B4F5C998B94CF12243233BFF71E0055CBD75D15CF"
-                     "115F8BCD65A47E44E5CD133")
+            req.get_pubkey().get_modulus(),
+            "F4B61171513736BFAA95E79C11C5FC2705439E3786D57EEE72C0"
+            "9AB2EB993347B4F5C998B94CF12243233BFF71E0055CBD75D15CF"
+            "115F8BCD65A47E44E5CD133")
 
 
 if __name__ == '__main__':