Print usage message on when given '-?'.

Closes Supervisor#1251

Author: mnaberez

CHANGES.rst

@@ -17,6 +17,9 @@
 - The  ``supervisorctl signal`` command now allows a signal to be sent
   when a process is in the ``STOPPING`` state.  Patch by Mike Gould.
 
+- ``supervisorctl`` and ``supervisord`` now print help when given ``-?``
+  in addition to the existing ``-h``/``--help``.
+
 4.2.1 (2020-08-20)
 ------------------
 

supervisor/options.py

@@ -102,6 +102,7 @@ def __init__(self, require_configfile=True):
         self.attr_priorities = {}
         self.require_configfile = require_configfile
         self.add(None, None, "h", "help", self.help)
+        self.add(None, None, "?", None, self.help)
         self.add("configfile", None, "c:", "configuration=")
 
         here = os.path.dirname(os.path.dirname(sys.argv[0]))

supervisor/tests/test_end_to_end.py

@@ -206,6 +206,21 @@ def test_issue_1231c(self):
                                  timeout=30)
             supervisorctl.expect('Unicode output may fail.', timeout=30)
 
+    def test_issue_1251(self):
+        args = ['-m', 'supervisor.supervisord', '-?']
+        supervisord = pexpect.spawn(sys.executable, args, encoding='utf-8')
+        self.addCleanup(supervisord.kill, signal.SIGINT)
+        supervisord.expect_exact("supervisord -- run a set of applications")
+        supervisord.expect_exact("-l/--logfile FILENAME -- use FILENAME as")
+        supervisord.expect(pexpect.EOF)
+
+        args = ['-m', 'supervisor.supervisorctl', '-?']
+        supervisorctl = pexpect.spawn(sys.executable, args, encoding='utf-8')
+        self.addCleanup(supervisorctl.kill, signal.SIGINT)
+        supervisorctl.expect_exact("supervisorctl -- control applications")
+        supervisorctl.expect_exact("-i/--interactive -- start an interactive")
+        supervisorctl.expect(pexpect.EOF)
+
     def test_issue_1298(self):
         filename = pkg_resources.resource_filename(__name__, 'fixtures/issue-1298.conf')
         args = ['-m', 'supervisor.supervisord', '-c', filename]