Apply suggestions from code review

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>

Author: berthin

Doc/library/netrc.rst

@@ -19,8 +19,8 @@ the Unix :program:`ftp` program and other FTP clients.
 
    A :class:`~netrc.netrc` instance or subclass instance encapsulates data from  a netrc
    file. The initialization argument, if present, specifies the file to parse. If no
-   argument is given, it will look for the file path in the :envvar:`!NETRC` environment variable.
-   If that is not set, it defaults to reading the file :file:`.netrc` in the user's home
+   argument is given, it will look for the file path in the :envvar:`!NETRC` environment variable,
+   before defaulting to reading the file :file:`.netrc` in the user's home
    directory -- as determined by :func:`os.path.expanduser`. If the file cannot be found,
    a :exc:`FileNotFoundError` exception will be raised.
    Parse errors will raise :exc:`NetrcParseError` with diagnostic
@@ -47,9 +47,7 @@ the Unix :program:`ftp` program and other FTP clients.
       If the login name is anonymous, it won't trigger the security check.
 
    .. versionadded:: next
-      :class:`netrc` try to use the value of the :envvar:`NETRC` environment variable
-      if when *file* is not passed as argument, before falling back to the user's
-      :file:`.netrc` file in the home directory.
+      Added support for the :envvar:`!NETRC` environment variable.
 
 
 .. exception:: NetrcParseError

Doc/whatsnew/3.15.rst

@@ -119,7 +119,7 @@ math
 netrc
 -----
 
-* Support :envvar:`!NETRC` environment variable in :func:`netrc.netrc`.
+* Added support for the :envvar:`NETRC` environment variable in :func:`netrc.netrc`.
   (Contributed by Berthin Torres in :gh:`135788`.)
 
 

Lib/test/test_netrc.py

@@ -1,7 +1,7 @@
 import netrc, os, unittest, sys, textwrap
-
-from test import support
 from contextlib import ExitStack
+from test import support
+from test.support import os_helper
 
 try:
     import pwd
@@ -36,24 +36,15 @@ def __exit__(self, *ignore_exc):
         self.stack.close()
 
     def generate_netrc(
-        self,
-        content,
-        filename=".netrc",
-        mode=0o600,
-        encoding="utf-8",
+        self, content, filename=".netrc", mode=0o600, encoding=None,
     ):
         """Create and return the path to a temporary `.netrc` file."""
-        write_mode = "w"
-        if sys.platform != "cygwin":
-            write_mode += "t"
-
         netrc_file = os.path.join(self.tmpdir, filename)
+        write_mode = "w" if sys.platform != "cygwin" else "wt"
         with open(netrc_file, mode=write_mode, encoding=encoding) as fp:
             fp.write(textwrap.dedent(content))
-
         if support.os_helper.can_chmod():
             os.chmod(netrc_file, mode=mode)
-
         return netrc_file
 
 
@@ -70,7 +61,6 @@ def use_default_netrc_in_home(*args, **kwargs):
         with NetrcEnvironment() as helper:
             helper.environ.unset("NETRC")
             helper.environ.set("HOME", helper.tmpdir)
-
             helper.generate_netrc(*args, **kwargs)
             return netrc.netrc()
 
@@ -82,7 +72,6 @@ def use_netrc_envvar(*args, **kwargs):
         with NetrcEnvironment() as helper:
             netrc_file = helper.generate_netrc(*args, **kwargs)
             helper.environ.set("NETRC", netrc_file)
-
             return netrc.netrc()
 
     @staticmethod
@@ -93,7 +82,6 @@ def use_file_argument(*args, **kwargs):
             # Just to stress a bit more the test scenario, the NETRC envvar
             # will contain rubish information which shouldn't be used
             helper.environ.set("NETRC", "not-a-file.netrc")
-
             netrc_file = helper.generate_netrc(*args, **kwargs)
             return netrc.netrc(netrc_file)