From 4c576b6ea6e6ca5a252af4d58cc749c4d25972eb Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 17 Jan 2024 11:03:10 +0100
Subject: [PATCH] [py] ruff fixes in
Tests/Data/Mechanics/Linear/PythonPiston/post.py.
---
.../Mechanics/Linear/PythonPiston/post.py | 20 ++++++++-----------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/Tests/Data/Mechanics/Linear/PythonPiston/post.py b/Tests/Data/Mechanics/Linear/PythonPiston/post.py
index 8a0cc5e795e..d9cb2671a3a 100755
--- a/Tests/Data/Mechanics/Linear/PythonPiston/post.py
+++ b/Tests/Data/Mechanics/Linear/PythonPiston/post.py
@@ -1,5 +1,8 @@
#!/usr/bin/vtkpython
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
import chamber as ch
import matplotlib.pyplot as plt
import numpy as np
@@ -11,18 +14,11 @@ pvd_file = "out/piston_pcs_0.pvd"
### helpers ##############################################
-import os
-
-try:
- import xml.etree.ElementTree as ET
-except:
- import xml.etree.ElementTree as ET
-
def relpathfrom(origin, relpath):
- if os.path.isabs(relpath):
- return relpath
- return os.path.join(origin, relpath)
+ if relpath.is_absolute():
+ return str(relpath)
+ return str(origin / relpath)
def read_pvd_file(fn):
@@ -30,7 +26,7 @@ def read_pvd_file(fn):
path = fn.name
except AttributeError:
path = fn
- pathroot = os.path.dirname(path)
+ pathroot = Path(path).parent
pvdtree = ET.parse(fn)
node = pvdtree.getroot()
if node.tag != "VTKFile":
@@ -49,7 +45,7 @@ def read_pvd_file(fn):
if child.tag != "DataSet":
return None, None
ts.append(float(child.get("timestep")))
- fs.append(relpathfrom(pathroot, child.get("file")))
+ fs.append(relpathfrom(pathroot, Path(child.get("file"))))
return ts, fs
--
GitLab