bpo-38347: Use local variables with better names

Use local variables with better names instead of class attributes.

Author: rpluem

Lib/test/test_tools/test_pathfix.py

@@ -14,29 +14,32 @@ class TestPathfixFunctional(unittest.TestCase):
     script = os.path.join(scriptsdir, 'pathfix.py')
 
     def setUp(self):
-        self.temp_file = support.TESTFN
         self.addCleanup(support.unlink, support.TESTFN)
 
     def pathfix(self, shebang, pathfix_flags, exitcode=0, stdout='', stderr='',
-                filename=''):
-        if filename == '':
-            filename = self.temp_file
-
-        with open(self.temp_file, 'w', encoding='utf8') as f:
+                directory=''):
+        if directory:
+            filename = os.path.join(directory, 'script-A_1.py')
+            pathfix_arg = directory
+        else:
+            filename = support.TESTFN
+            pathfix_arg = filename
+
+        with open(filename, 'w', encoding='utf8') as f:
             f.write(f'{shebang}\n' + 'print("Hello world")\n')
 
         proc = subprocess.run(
             [sys.executable, self.script,
-             *pathfix_flags, '-n', filename],
+             *pathfix_flags, '-n', pathfix_arg],
             capture_output=True, text=1)
 
         if stdout == '' and proc.returncode == 0:
-            stdout = f'{self.temp_file}: updating\n'
+            stdout = f'{filename}: updating\n'
         self.assertEqual(proc.returncode, exitcode, proc)
         self.assertEqual(proc.stdout, stdout, proc)
         self.assertEqual(proc.stderr, stderr, proc)
 
-        with open(self.temp_file, 'r', encoding='utf8') as f:
+        with open(filename, 'r', encoding='utf8') as f:
             output = f.read()
 
         lines = output.split('\n')
@@ -49,18 +52,15 @@ def pathfix(self, shebang, pathfix_flags, exitcode=0, stdout='', stderr='',
         return new_shebang
 
     def test_recursive(self):
-        self.temp_directory = support.TESTFN + '.d'
-        self.addCleanup(support.rmtree, self.temp_directory)
-        os.mkdir(self.temp_directory)
-        self.temp_file = self.temp_directory + os.sep + \
-                         os.path.basename(support.TESTFN) + '-t.py'
-        temp_directory_basename = os.path.basename(self.temp_directory)
-        expected_stderr = f'recursedown(\'{temp_directory_basename}\')\n'
+        tmpdir = support.TESTFN + '.d'
+        self.addCleanup(support.rmtree, tmpdir)
+        os.mkdir(tmpdir)
+        expected_stderr = f'recursedown(\'{os.path.basename(tmpdir)}\')\n'
         self.assertEqual(
             self.pathfix(
                 '#! /usr/bin/env python',
                 ['-i', '/usr/bin/python3'],
-                filename=self.temp_directory,
+                directory=tmpdir,
                 stderr=expected_stderr),
             '#! /usr/bin/python3')