From dd1df820adb5bc4e0d42a02480c1501a75547a60 Mon Sep 17 00:00:00 2001
From: Noah Swartz <swartzcr@SAMIZDAT>
Date: Thu, 22 Oct 2015 16:09:47 -0700
Subject: [PATCH] hid manual option

---
 letsencrypt/display/ops.py        | 2 +-
 letsencrypt/plugins/manual.py     | 1 +
 letsencrypt/plugins/standalone.py | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/letsencrypt/display/ops.py b/letsencrypt/display/ops.py
index c21b07c03..37ce66b62 100644
--- a/letsencrypt/display/ops.py
+++ b/letsencrypt/display/ops.py
@@ -74,7 +74,7 @@ def pick_plugin(config, default, plugins, question, ifaces):
 
     if len(prepared) > 1:
         logger.debug("Multiple candidate plugins: %s", prepared)
-        plugin_ep = choose_plugin(prepared.values()[::-1], question)
+        plugin_ep = choose_plugin(prepared.values(), question)
         if plugin_ep is None:
             return None
         else:
diff --git a/letsencrypt/plugins/manual.py b/letsencrypt/plugins/manual.py
index 26724580c..7c10bbcf3 100644
--- a/letsencrypt/plugins/manual.py
+++ b/letsencrypt/plugins/manual.py
@@ -31,6 +31,7 @@ class Authenticator(common.Plugin):
     """
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)
+    hidden = True
 
     description = "Manually Edit Your Configuration"
 
diff --git a/letsencrypt/plugins/standalone.py b/letsencrypt/plugins/standalone.py
index b07067b4d..a922275a6 100644
--- a/letsencrypt/plugins/standalone.py
+++ b/letsencrypt/plugins/standalone.py
@@ -134,6 +134,8 @@ def supported_challenges_validator(data):
 
 
 class Authenticator(common.Plugin):
+    """Standalone Authenticator."""
+
     zope.interface.implements(interfaces.IAuthenticator)
     zope.interface.classProvides(interfaces.IPluginFactory)
 
@@ -178,7 +180,7 @@ class Authenticator(common.Plugin):
 This authenticator creates its own ephemeral TCP listener on the
  necessary port in order to respond to incoming DVSNI and SimpleHTTP
  challenges from the certificate authority. Therefore, it does not
- rely on any existing server program.""".replace("\n","")
+ rely on any existing server program.""".replace("\n", "")
 
     def prepare(self):  # pylint: disable=missing-docstring
         pass