From 982f298194095a5bf9fa310b54e3f13d31b54e21 Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 17 Jul 2018 21:15:41 -0500 Subject: [PATCH 1/2] Fix newline_comment_space issue --- Lib/netrc.py | 8 +++++--- Lib/test/test_netrc.py | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Lib/netrc.py b/Lib/netrc.py index f0ae48cfed9e67e..f670504a86196e7 100644 --- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -35,13 +35,15 @@ 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 + 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() + if len(tt) != 1: + pos = max(pos - 1, 0) + lexer.instream.seek(pos) + lexer.instream.readline() continue elif tt == 'machine': entryname = lexer.get_token() diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py index f59e5371acad3ba..e4f5061454efdf7 100644 --- a/Lib/test/test_netrc.py +++ b/Lib/test/test_netrc.py @@ -165,6 +165,14 @@ 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')) + if __name__ == "__main__": unittest.main() From ea5b5f24c6e90204752d7d54439e2ec5142ce8c2 Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 17 Jul 2018 21:23:35 -0500 Subject: [PATCH 2/2] Add NEWS entry --- .../NEWS.d/next/Library/2018-07-17-21-23-31.bpo-34132.FK4czq.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2018-07-17-21-23-31.bpo-34132.FK4czq.rst diff --git a/Misc/NEWS.d/next/Library/2018-07-17-21-23-31.bpo-34132.FK4czq.rst b/Misc/NEWS.d/next/Library/2018-07-17-21-23-31.bpo-34132.FK4czq.rst new file mode 100644 index 000000000000000..01a4fa37c29b792 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-07-17-21-23-31.bpo-34132.FK4czq.rst @@ -0,0 +1 @@ +Fixed regression in netrc file newline and comment handling.