[tor-commits] [ooni-probe/master] Remove UsageOptions to HandshakeOptions, and make arg help strings more informative.

[art at torproject.org]

commit c969c741049d78cdd8cdb5514a52d3411cb714ec
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Apr 22 00:22:00 2013 +0000

    Remove UsageOptions to HandshakeOptions, and make arg help strings more informative.
---
 nettests/experimental/tls_handshake.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py
index 3ab9471..3b94504 100644
--- a/nettests/experimental/tls_handshake.py
+++ b/nettests/experimental/tls_handshake.py
@@ -106,11 +106,13 @@ class ConnectionTimeout(Exception):
     """
     pass
 
-class UsageOptions(usage.Options):
+class HandshakeOptions(usage.Options):
+    """ :class:`usage.Options <Options>` parser for the tls-handshake test."""
     optParameters = [
-        ['host', 'h', None, 'Remote host IP address (v4/v6)'],
+        ['host', 'h', None,
+         'Remote host IP address (v4/v6) and port, i.e. "1.2.3.4:443"'],
         ['port', 'p', None,
-         "Use this port for all hosts, regardless of port specified in file"],
+         'Use this port for all hosts, regardless of port specified in file'],
         ['ciphersuite', 'c', None ,
          'File containing ciphersuite list, one per line'],]
     optFlags = [