diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-12-02 03:16:23 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-12-02 03:16:23 (GMT) |
| commit | d75cc91647738727109cfd07c75cf1b69f5f3659 (patch) | |
| tree | 057b3a4efd0b477d4a3a356696528657e71bff11 /Lib/netrc.py | |
| parent | 27f5a7e4629d4e0cd8a3244dfba4fe0bb180f9fd (diff) | |
| download | cpython-d75cc91647738727109cfd07c75cf1b69f5f3659.zip cpython-d75cc91647738727109cfd07c75cf1b69f5f3659.tar.gz cpython-d75cc91647738727109cfd07c75cf1b69f5f3659.tar.bz2 | |
Merged revisions 86925 via svnmerge from
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.
........
Diffstat (limited to 'Lib/netrc.py')
| -rw-r--r-- | Lib/netrc.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/netrc.py b/Lib/netrc.py index 723fc31..4caeb96 100644 --- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -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': |