Skip to content

bpo-34132: Fix netrc parsing regression #8360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bbayles wants to merge 3 commits into from
Closed

bpo-34132: Fix netrc parsing regression #8360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bfae49
Re-adapt Python 2 solution
bbayles Jul 21, 2018
db738e7
Add NEWS entry
bbayles Jul 21, 2018
ccb2599
Add tests for regression
bbayles Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Lib/netrc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@ def _parse(self, file, fp, default_netrc):
lexer.commenters = lexer.commenters.replace('#', '')
while 1:
# Look for a machine, default, or macdef top-level keyword
saved_lineno = lexer.lineno
saved_pos = lexer.instream.tell()
toplevel = tt = lexer.get_token()
if not tt:
break
elif tt[0] == '#':
if lexer.lineno == saved_lineno and len(tt) == 1:
lexer.instream.readline()
# seek to beginning of comment, in case reading the token put
# us on a new line, and then skip the rest of the line.
new_pos = lexer.instream.tell()
lexer.instream.seek(new_pos - len(tt) - 1)
lexer.instream.readline()
continue
elif tt == 'machine':
entryname = lexer.get_token()
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_netrc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,22 @@ def fake_expanduser(s):

self.assertTrue(called)

def test_newline_comment_space(self):
nrc = self.make_nrc(
'\n'
'# Comment\n'
'default login anonymous password user@site\n'
)
self.assertEqual(nrc.hosts['default'], ('anonymous', None, 'user@site'))

def test_newline_comment_no_space(self):
nrc = self.make_nrc(
'\n'
'#Comment\n'
'default login anonymous password user@site\n'
)
self.assertEqual(nrc.hosts['default'], ('anonymous', None, 'user@site'))


if __name__ == "__main__":
unittest.main()
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2018-07-20-19-54-05.bpo-34132.FK4czq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed regression in netrc file newline and comment handling.