Improve the self-test code a bit: read a host from sys.argv[1] if set,

and list the host name when prompting for the password.

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index e62764452ed8f631392d46bb68a1128b52334995..caea5bfc582fe0ad416b694378114c22cf505da0 100644 (file)
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -781,9 +781,15 @@ def Time2Internaldate(date_time):
 
 if __debug__ and __name__ == '__main__':
 
+       host = ''
+       import sys
+       if sys.argv[1:]:
+               host = sys.argv[1]
+
        import getpass
        USER = getpass.getuser()
-       PASSWD = getpass.getpass()
+       PASSWD = getpass.getpass(
+               "IMAP password for %s: " % (host or "localhost"))
 
        test_seq1 = (
        ('login', (USER, PASSWD)),
@@ -815,7 +821,7 @@ if __debug__ and __name__ == '__main__':
                return dat
 
        Debug = 4
-       M = IMAP4()
+       M = IMAP4(host)
        print 'PROTOCOL_VERSION = %s' % M.PROTOCOL_VERSION
 
        for cmd,args in test_seq1: