address review

Author: lpyu001

Lib/netrc.py

@@ -140,22 +140,16 @@ def _parse(self, file, fp, default_netrc):
                     if lexer.lineno == prev_lineno:
                         lexer.instream.readline()
                     continue
-                if tt is None or tt in {'machine', 'default', 'macdef'}:
+                if tt in {None, 'machine', 'default', 'macdef'}:
                     self.hosts[entryname] = (login, account, password)
                     lexer.push_token(tt)
                     break
                 elif tt == 'login' or tt == 'user':
-                    login = lexer.get_token()
-                    if login is None:
-                        login = ''
+                    login = lexer.get_token() or ''
                 elif tt == 'account':
-                    account = lexer.get_token()
-                    if account is None:
-                        account = ''
+                    account = lexer.get_token() or ''
                 elif tt == 'password':
-                    password = lexer.get_token()
-                    if password is None:
-                        password = ''
+                    password = lexer.get_token() or ''
                 else:
                     raise NetrcParseError("bad follower token %r" % tt,
                                           file, lexer.lineno)

Lib/test/test_netrc.py

@@ -62,6 +62,9 @@ def test_optional_tokens(self):
             "machine host.domain.com login",
             "machine host.domain.com account",
             "machine host.domain.com password",
+            "machine host.domain.com login \"\"",
+            "machine host.domain.com account \"\"",
+            "machine host.domain.com password \"\"",
             "machine host.domain.com login \"\" account",
             "machine host.domain.com login \"\" password",
             "machine host.domain.com account \"\" password"
@@ -74,6 +77,9 @@ def test_optional_tokens(self):
             "default login",
             "default account",
             "default password",
+            "default login \"\"",
+            "default account \"\"",
+            "default password \"\"",
             "default login \"\" account",
             "default login \"\" password",
             "default account \"\" password"