From b19c74be327c03fdb2810fc492fbbc8a6e7ec71b Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Mon, 14 Mar 2016 18:44:29 -0700
Subject: [PATCH] Address review comments

---
 letsencrypt/cli.py  |  7 +++----
 letsencrypt/main.py | 11 ++++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index b76311777..c4d127718 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -1,4 +1,4 @@
-"""Let's Encrypt command CLI argument processing."""
+"""Let's Encrypt command line argument & config processing."""
 # pylint: disable=too-many-lines
 from __future__ import print_function
 import argparse
@@ -634,10 +634,9 @@ class HelpfulArgumentParser(object):
         from letsencrypt import main
         self.VERBS = main.VERBS
         # List of topics for which additional help can be provided
-        HELP_TOPICS = ["all", "security",
-                       "paths", "automation", "testing"] + list(six.iterkeys(self.VERBS))
+        HELP_TOPICS = ["all", "security", "paths", "automation", "testing"] + list(self.VERBS)
 
-        plugin_names = list(six.iterkeys(plugins))
+        plugin_names = list(plugins)
         self.help_topics = HELP_TOPICS + plugin_names + [None]
         usage, short_usage = usage_strings(plugins)
         self.parser = configargparse.ArgParser(
diff --git a/letsencrypt/main.py b/letsencrypt/main.py
index 56725d300..d2d2c55ac 100644
--- a/letsencrypt/main.py
+++ b/letsencrypt/main.py
@@ -2,8 +2,13 @@
 from __future__ import print_function
 import atexit
 import functools
+import logging.handlers
 import os
 import sys
+import time
+import traceback
+
+import OpenSSL
 import zope.component
 
 import letsencrypt
@@ -22,15 +27,11 @@ from letsencrypt import log
 from letsencrypt import reporter
 from letsencrypt import storage
 
+from acme import jose
 from letsencrypt.cli import choose_configurator_plugins, _renewal_conf_files, should_renew
 from letsencrypt.display import util as display_util, ops as display_ops
 from letsencrypt.plugins import disco as plugins_disco
 
-import traceback
-import logging.handlers
-import time
-from acme import jose
-import OpenSSL
 
 logger = logging.getLogger(__name__)