Remove the curses dialog, thereby deprecating the --help and --dialog command line options (#3665)

* Remove the curses dialog, thereby deprecating the --help and --dialog command line options

* Deprecate --dialog and suppress --text

certbot/plugins/manual.py

@@ -243,7 +243,7 @@ s.serve_forever()" """
         # pylint: disable=no-self-use
         # TODO: IDisplay wraps messages, breaking the command
         #answer = zope.component.getUtility(interfaces.IDisplay).notification(
-        #    message=message, height=25, pause=True)
+        #    message=message, pause=True)
         sys.stdout.write(message)
         six.moves.input("Press ENTER to continue")
 

certbot/plugins/selection.py

@@ -119,8 +119,7 @@ def choose_plugin(prepared, question):
                 z_util(interfaces.IDisplay).notification(
                     "The selected plugin encountered an error while parsing "
                     "your server configuration and cannot be used. The error "
-                    "was:\n\n{0}".format(plugin_ep.prepare()),
-                    height=display_util.HEIGHT, pause=False)
+                    "was:\n\n{0}".format(plugin_ep.prepare()), pause=False)
             else:
                 return plugin_ep
         elif code == display_util.HELP:
@@ -128,8 +127,7 @@ def choose_plugin(prepared, question):
                 msg = "Reported Error: %s" % prepared[index].prepare()
             else:
                 msg = prepared[index].init().more_info()
-            z_util(interfaces.IDisplay).notification(
-                msg, height=display_util.HEIGHT)
+            z_util(interfaces.IDisplay).notification(msg)
         else:
             return None
 

certbot/plugins/util.py

@@ -103,7 +103,7 @@ def already_listening_socket(port, renewer=False):
                 "Port {0} is already in use by another process. This will "
                 "prevent us from binding to that port. Please stop the "
                 "process that is populating the port in question and try "
-                "again. {1}".format(port, extra), height=13)
+                "again. {1}".format(port, extra))
             return True
         finally:
             testsocket.close()
@@ -151,8 +151,7 @@ def already_listening_psutil(port, renewer=False):
                 "The program {0} (process ID {1}) is already listening "
                 "on TCP port {2}. This will prevent us from binding to "
                 "that port. Please stop the {0} program temporarily "
-                "and then try again.{3}".format(name, pid, port, extra),
-                height=13)
+                "and then try again.{3}".format(name, pid, port, extra))
             return True
     except (psutil.NoSuchProcess, psutil.AccessDenied):
         # Perhaps the result of a race where the process could have

certbot/plugins/webroot.py

@@ -140,9 +140,8 @@ to serve all files under specified web root ({0})."""
             code, webroot = display.directory_select(
                 "Input the webroot for {0}:".format(domain))
             if code == display_util.HELP:
-                # Help can currently only be selected
-                # when using the ncurses interface
-                display.notification(display_util.DSELECT_HELP)
+                # Displaying help is not currently implemented
+                return None
             elif code == display_util.CANCEL:
                 return None
             else:  # code == display_util.OK

certbot/plugins/webroot_test.py

@@ -111,8 +111,7 @@ class AuthenticatorTest(unittest.TestCase):
 
         self.assertTrue(mock_display.notification.called)
         for call in mock_display.notification.call_args_list:
-            self.assertTrue(imaginary_dir in call[0][0] or
-                            display_util.DSELECT_HELP == call[0][0])
+            self.assertTrue(imaginary_dir in call[0][0])
 
         self.assertTrue(mock_display.directory_select.called)
         for call in mock_display.directory_select.call_args_list: