diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2002-03-22 02:46:41 +0000 |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2002-03-22 02:46:41 +0000 |
| commit | 068db13e6dc4980bb87b77d9056610adc1968256 (patch) | |
| tree | ac44441dd406a7d3c4c2400eff94b4c0c704889c /Lib/netrc.py | |
| parent | e8f2230c57a8613bdba9a732deb410ab08e032c5 (diff) | |
| download | cpython-068db13e6dc4980bb87b77d9056610adc1968256.tar.gz | |
[Bug #532115] netrc module was broken
* 'macdef' (macro definition) wasn't parsed correctly
* account value not reset for a subsequent 'default' line
* typo: 'whitepace' -> 'whitespace'
Bugfix candidate.
Diffstat (limited to 'Lib/netrc.py')
| -rw-r--r-- | Lib/netrc.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Lib/netrc.py b/Lib/netrc.py index b78d4d83e5..b6907d9579 100644 --- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -44,28 +44,26 @@ class netrc: elif tt == 'macdef': # Just skip to end of macdefs entryname = lexer.get_token() self.macros[entryname] = [] - lexer.whitepace = ' \t' + lexer.whitespace = ' \t' while 1: line = lexer.instream.readline() - if not line or line == '\012' and tt == '\012': - lexer.whitepace = ' \t\r\n' + if not line or line == '\012': + lexer.whitespace = ' \t\r\n' break - tt = line self.macros[entryname].append(line) + continue else: raise NetrcParseError( "bad toplevel token %r" % tt, file, lexer.lineno) # We're looking at start of an entry for a named machine or default. - if toplevel == 'machine': - login = account = password = None - self.hosts[entryname] = {} + 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 toplevel == 'macdef': - break - elif login and password: + if (tt=='' or tt == 'machine' or + tt == 'default' or tt =='macdef'): + if login and password: self.hosts[entryname] = (login, account, password) lexer.push_token(tt) break |