Merge pull request #135 from tcalmant/deprecation-handling

Handle deprecation warnings
tcalmant · Aug 22, 2024 · adfc4b8 · adfc4b8
2 parents 688f820 + 6ea1775
commit adfc4b8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pelix/rsa/edef.py b/pelix/rsa/edef.py
@@ -250,7 +250,7 @@ def _indent(self, element: ElementTree.Element, level: int = 0, prefix: str = "\
         """
         element_prefix = "\n{0}".format(level * prefix)
 
-        if element:
+        if len(element) != 0:
             if not element.text or not element.text.strip():
                 element.text = element_prefix + prefix
 

diff --git a/pelix/shell/report.py b/pelix/shell/report.py
@@ -605,7 +605,7 @@ def make_report(self, session: ShellSession, *levels: str) -> Optional[Dict[str,
                 "report.levels": levels,
                 "time.stamp": time.time(),
                 "time.local": str(datetime.datetime.now()),
-                "time.utc": str(datetime.datetime.utcnow()),
+                "time.utc": str(datetime.datetime.now(datetime.timezone.utc)),
             }
 
         return self.__report

diff --git a/tests/rsa/test_py4j_tutorial.py b/tests/rsa/test_py4j_tutorial.py
@@ -10,6 +10,7 @@
 import os
 import pathlib
 import subprocess
+import sys
 import tarfile
 import tempfile
 import time
@@ -90,7 +91,10 @@ def safe_extract(
 
                     try:
                         os.chdir(folder)
-                        tar.extractall(path, filtered_members, numeric_owner=numeric_owner)
+                        if sys.version_info < (3, 12):
+                            tar.extractall(path, filtered_members, numeric_owner=numeric_owner)
+                        else:
+                            tar.extractall(path, filtered_members, numeric_owner=numeric_owner, filter="data")
                     finally:
                         os.chdir(cur_dir)