clean up

Author: Berthin Torres

Lib/netrc.py

@@ -65,10 +65,10 @@ def push_token(self, token):
 
 class netrc:
     def __init__(self, file=None):
-        netrc_envvar = os.environ.get("NETRC", "")
-        default_netrc = file is None and not bool(netrc_envvar)
-        if file is None:
-            file = netrc_envvar or os.path.join(os.path.expanduser("~"), ".netrc")
+        envvar_netrc = os.environ.get("NETRC", "")
+        home_netrc = os.path.join(os.path.expanduser("~"), ".netrc")
+        file = file or envvar_netrc or home_netrc
+        default_netrc = (file == home_netrc)
         self.hosts = {}
         self.macros = {}
         try:

Lib/test/test_netrc.py

@@ -22,9 +22,9 @@ def __enter__(self):
         """Enter the managed environment."""
         self.stack = ExitStack()
         self.environ = self.stack.enter_context(
-            support.os_helper.EnvironmentVarGuard(),
+            os_helper.EnvironmentVarGuard(),
         )
-        self.tmpdir = self.stack.enter_context(support.os_helper.temp_dir())
+        self.tmpdir = self.stack.enter_context(os_helper.temp_dir())
         return self
 
     def __exit__(self, *ignore_exc):
@@ -43,7 +43,7 @@ def generate_netrc(
         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():
+        if os_helper.can_chmod():
             os.chmod(netrc_file, mode=mode)
         return netrc_file
 
@@ -372,20 +372,20 @@ def test_comment_at_end_of_machine_line_pass_has_hash(self, make_nrc):
 
     @unittest.skipUnless(os.name == 'posix', 'POSIX only test')
     @unittest.skipIf(pwd is None, 'security check requires pwd module')
-    @support.os_helper.skip_unless_working_chmod
+    @os_helper.skip_unless_working_chmod
     def test_security(self):
         # This test is incomplete since we are normally not run as root and
         # therefore can't test the file ownership being wrong.
-        d = support.os_helper.TESTFN
+        d = os_helper.TESTFN
         os.mkdir(d)
-        self.addCleanup(support.os_helper.rmtree, d)
+        self.addCleanup(os_helper.rmtree, d)
         fn = os.path.join(d, '.netrc')
         with open(fn, 'wt') as f:
             f.write("""\
                 machine foo.domain.com login bar password pass
                 default login foo password pass
                 """)
-        with support.os_helper.EnvironmentVarGuard() as environ:
+        with os_helper.EnvironmentVarGuard() as environ:
             environ.set('HOME', d)
             os.chmod(fn, 0o600)
             nrc = netrc.netrc()
@@ -398,7 +398,7 @@ def test_security(self):
                 machine foo.domain.com login anonymous password pass
                 default login foo password pass
                 """)
-        with support.os_helper.EnvironmentVarGuard() as environ:
+        with os_helper.EnvironmentVarGuard() as environ:
             environ.set('HOME', d)
             os.chmod(fn, 0o600)
             nrc = netrc.netrc()