Backport 1.18:

SF bug 557704: netrc module can't handle all passwords

Let netrc handle entries with login fields (mail servers for instance)
by having login default to ''.

diff --git a/Lib/netrc.py b/Lib/netrc.py
index 5c9e1ff5217f79b1be9a6b971725da6408bb5a60..3290b1795c49005bfbf4a9f1554eeeb4baa62890 100644 (file)
--- a/Lib/netrc.py
+++ b/Lib/netrc.py
@@ -27,7 +27,7 @@ class netrc:
         self.hosts = {}
         self.macros = {}
         lexer = shlex.shlex(fp)
-        lexer.wordchars  += r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
+        lexer.wordchars += r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
         while 1:
             # Look for a machine, default, or macdef top-level keyword
             toplevel = tt = lexer.get_token()
@@ -53,13 +53,14 @@ class netrc:
                     "bad toplevel token %r" % tt, file, lexer.lineno)
 
             # We're looking at start of an entry for a named machine or default.
-            login = account = password = None
+            login = ''
+            account = password = None
             self.hosts[entryname] = {}
             while 1:
                 tt = lexer.get_token()
                 if (tt=='' or tt == 'machine' or
                     tt == 'default' or tt =='macdef'):
-                    if login and password:
+                    if password:
                         self.hosts[entryname] = (login, account, password)
                         lexer.push_token(tt)
                         break