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

Merged revisions 86925 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86925 | r.david.murray | 2010-12-01 21:58:07 -0500 (Wed, 01 Dec 2010) | 4 lines

  #10464: fix netrc handling of lines with embedded '#" characters.

  Patch by Xuanji Li.
........
This commit is contained in:
R. David Murray 2010-12-02 03:16:23 +00:00
parent 27f5a7e462
commit d75cc91647
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/netrc.py
View file

@ -34,11 +34,15 @@ class netrc:
def _parse(self, file, fp):
lexer = shlex.shlex(fp)
lexer.wordchars += r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
lexer.commenters = lexer.commenters.replace('#', '')
while 1:
# Look for a machine, default, or macdef top-level keyword
toplevel = tt = lexer.get_token()
if not tt:
break
elif tt[0] == '#':
fp.readline();
continue;
elif tt == 'machine':
entryname = lexer.get_token()
elif tt == 'default':