mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 22:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix regression in netrc comment handling (closes #12009)

Browse source
This commit is contained in:
Benjamin Peterson 2011-06-10 11:32:52 -05:00
parent 2231e1a01f
commit 43ee1a5d90
4 changed files with 107 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/netrc.py
View file

@ -41,8 +41,12 @@ class netrc:
if not tt:
break
elif tt[0] == '#':
fp.readline();
continue;
# seek to beginning of comment, in case reading the token put
# us on a new line, and then skip the rest of the line.
pos = len(tt) + 1
lexer.instream.seek(-pos, 1)
lexer.instream.readline()
continue
elif tt == 'machine':
entryname = lexer.get_token()
elif tt == 'default':
@ -68,8 +72,8 @@ class netrc:
self.hosts[entryname] = {}
while 1:
tt = lexer.get_token()
if (tt=='' or tt == 'machine' or
tt == 'default' or tt =='macdef'):
if (tt.startswith('#') or
tt in {'', 'machine', 'default', 'macdef'}):
if password:
self.hosts[entryname] = (login, account, password)
lexer.push_token(tt)