Fix usage of tempfile.mkdir

Changed in Python version 3.12: mkdtemp() now always returns an absolute path, even if dir is relative. Signed-off-by: Antonin Bas <antonin.bas@gmail.com>
p4lang · Nov 10, 2023 · 00af910 · 00af910
1 parent e09fc4f
commit 00af910
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/backends/bmv2/bmv2stf.py b/backends/bmv2/bmv2stf.py
@@ -748,7 +748,7 @@ def run(self, stf_map):
                     str(rand),
                 ]
                 + self.interfaceArgs()
-                + ["../" + self.jsonfile]
+                + [self.jsonfile]
             )
             if self.cmd_line_args:
                 runswitch += self.cmd_line_args

diff --git a/backends/bmv2/run-bmv2-test.py b/backends/bmv2/run-bmv2-test.py
@@ -267,7 +267,8 @@ def process_file(options, argv):
 
     if run_init_commands(options) != SUCCESS:
         return FAILURE
-    tmpdir = tempfile.mkdtemp(dir=".")
+    # ensure that tempfile.mkdtemp returns an absolute path, regardless of the py3 version
+    tmpdir = tempfile.mkdtemp(dir=Path(".").absolute())
     basename = os.path.basename(options.p4filename)
     base, _ = os.path.splitext(basename)
 

diff --git a/backends/p4test/run-p4-sample.py b/backends/p4test/run-p4-sample.py
@@ -222,7 +222,7 @@ def file_name(tmpfolder, base, suffix, ext):
 def process_file(options, argv):
     assert isinstance(options, Options)
 
-    tmpdir = tempfile.mkdtemp(dir=".")
+    tmpdir = tempfile.mkdtemp(dir=Path(".").absolute())
     basename = os.path.basename(options.p4filename)
     base, ext = os.path.splitext(basename)
     dirname = os.path.dirname(options.p4filename)

diff --git a/backends/tc/run-tc-test.py b/backends/tc/run-tc-test.py
@@ -149,7 +149,7 @@ def check_generated_files(options, tmpdir, expecteddir):
 def process_file(options, argv):
     assert isinstance(options, Options)
 
-    tmpdir = tempfile.mkdtemp(dir=".")
+    tmpdir = tempfile.mkdtemp(dir=Path(".").absolute())
     basename = os.path.basename(options.p4filename)
     base, ext = os.path.splitext(basename)
     dirname = os.path.dirname(options.p4filename)