summaryrefslogtreecommitdiffstats
path: root/Lib/netrc.py
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-02 03:10:43 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-02 03:10:43 (GMT)
commit78a1a15c2029ebcbaba9801f9d1d50a55051e9fa (patch)
tree9d150acc473ff7a45f67c8de1dae253e7ed02aa0 /Lib/netrc.py
parent54065d43ab80bde60575bc4f63736b9ef59f6a4b (diff)
downloadcpython-78a1a15c2029ebcbaba9801f9d1d50a55051e9fa.zip
cpython-78a1a15c2029ebcbaba9801f9d1d50a55051e9fa.tar.gz
cpython-78a1a15c2029ebcbaba9801f9d1d50a55051e9fa.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.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/netrc.py b/Lib/netrc.py
index 90255df8..a60b8b7 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':