summaryrefslogtreecommitdiffstats
path: root/Lib/netrc.py
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-02 02:58:07 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-02 02:58:07 (GMT)
commitd2bb830edc7fc9e54b6ccd8c75a23ed8fee455e0 (patch)
tree87cb3e02894374a4aa4dcbe7b5a56c29b3f3f188 /Lib/netrc.py
parent2fdc7b1f759e557c57d16e91b9ac53f2b441c0be (diff)
downloadcpython-d2bb830edc7fc9e54b6ccd8c75a23ed8fee455e0.zip
cpython-d2bb830edc7fc9e54b6ccd8c75a23ed8fee455e0.tar.gz
cpython-d2bb830edc7fc9e54b6ccd8c75a23ed8fee455e0.tar.bz2
#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':