From cf487916868d3525c3307bb6f7b17a7a7ab2591d Mon Sep 17 00:00:00 2001
From: yan <yzhu@yahoo-inc.com>
Date: Tue, 5 May 2015 23:57:40 -0700
Subject: [PATCH] Address @kuba review comments

---
 letsencrypt/client/plugins/nginx/dvsni.py     | 24 +++++++++----------
 .../client/plugins/nginx/tests/dvsni_test.py  |  7 ++----
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/letsencrypt/client/plugins/nginx/dvsni.py b/letsencrypt/client/plugins/nginx/dvsni.py
index 0eab4d402..30af2e7a1 100644
--- a/letsencrypt/client/plugins/nginx/dvsni.py
+++ b/letsencrypt/client/plugins/nginx/dvsni.py
@@ -1,4 +1,5 @@
 """NginxDVSNI"""
+import itertools
 import logging
 import os
 
@@ -103,9 +104,8 @@ class NginxDvsni(ApacheDvsni):
                 'LetsEncrypt could not find an HTTP block to include DVSNI '
                 'challenges in %s.' % root)
 
-        config = []
-        for idx, addrs in enumerate(ll_addrs):
-            config.append(self._make_server_block(self.achalls[idx], addrs))
+        config = [self._make_server_block(pair[0], pair[1])
+                  for pair in itertools.izip(self.achalls, ll_addrs)]
 
         self.configurator.reverter.register_file_creation(
             True, self.challenge_conf)
@@ -126,17 +126,15 @@ class NginxDvsni(ApacheDvsni):
         :rtype: list
 
         """
-        block = []
-        for addr in addrs:
-            block.append(['listen', str(addr)])
-
-        block.append(['server_name', achall.nonce_domain])
-        block.append(['include', self.configurator.parser.loc["ssl_options"]])
-        block.append(['ssl_certificate', self.get_cert_file(achall)])
-        block.append(['ssl_certificate_key', achall.key.file])
-
         document_root = os.path.join(
             self.configurator.config.config_dir, "dvsni_page")
-        block.append([['location', '/'], [['root', document_root]]])
+
+        block = [['listen', str(addr)] for addr in addrs]
+
+        block.extend([['server_name', achall.nonce_domain],
+                      ['include', self.configurator.parser.loc["ssl_options"]],
+                      ['ssl_certificate', self.get_cert_file(achall)],
+                      ['ssl_certificate_key', achall.key.file],
+                      [['location', '/'], [['root', document_root]]]])
 
         return [['server'], block]
diff --git a/letsencrypt/client/plugins/nginx/tests/dvsni_test.py b/letsencrypt/client/plugins/nginx/tests/dvsni_test.py
index a44e0fcd6..15d7dbdb5 100644
--- a/letsencrypt/client/plugins/nginx/tests/dvsni_test.py
+++ b/letsencrypt/client/plugins/nginx/tests/dvsni_test.py
@@ -79,7 +79,7 @@ class DvsniPerformTest(util.NginxTest):
     def test_perform(self, mock_save):
         self.sni.add_chall(self.achalls[1])
         responses = self.sni.perform()
-        self.assertEqual(None, responses)
+        self.assertTrue(responses is None)
         self.assertEqual(mock_save.call_count, 1)
 
     def test_perform0(self):
@@ -153,10 +153,7 @@ class DvsniPerformTest(util.NginxTest):
         self.assertTrue(['include', self.sni.challenge_conf] in http[1])
 
         vhosts = self.sni.configurator.parser.get_vhosts()
-        vhs = []
-        for vhost in vhosts:
-            if vhost.filep == self.sni.challenge_conf:
-                vhs.append(vhost)
+        vhs = [vh for vh in vhosts if vh.filep == self.sni.challenge_conf]
 
         for vhost in vhs:
             if vhost.addrs == set(v_addr1):