har2tree 1.32.1__tar.gz → 1.34.0__tar.gz

{har2tree-1.32.1 → har2tree-1.34.0}/PKG-INFO

@@ -1,36 +1,35 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: har2tree
-Version: 1.32.1
+Version: 1.34.0
 Summary: HTTP Archive (HAR) to ETE Toolkit generator
-License: BSD-3-Clause
+License-Expression: BSD-3-Clause
+License-File: LICENSE
 Author: Raphaël Vinot
 Author-email: raphael.vinot@circl.lu
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Telecommunications Industry
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: Security
 Provides-Extra: docs
 Requires-Dist: Sphinx (>=8.2.3) ; (python_version >= "3.11") and (extra == "docs")
-Requires-Dist: beautifulsoup4[charset-normalizer,lxml] (>=4.13.5)
+Requires-Dist: beautifulsoup4[charset-normalizer,lxml] (>=4.14.2)
 Requires-Dist: ete3 (>=3.1.3)
 Requires-Dist: filetype (>=1.2.0)
 Requires-Dist: json-stream (>=2.3.3,<3.0.0)
-Requires-Dist: legacy-cgi (>=2.6.3) ; python_version >= "3.13,<4.0"
+Requires-Dist: legacy-cgi (>=2.6.3) ; python_version >= "3.13" and python_version < "4.0"
 Requires-Dist: multipart (>=1.3.0,<2.0.0)
-Requires-Dist: numpy (<2.1) ; python_version < "3.10"
-Requires-Dist: numpy (<2.3) ; python_version < "3.11"
-Requires-Dist: numpy (>=2.3.2) ; python_version >= "3.11"
-Requires-Dist: publicsuffixlist (>=1.0.2.20250824)
+Requires-Dist: numpy (>=2.2,<2.3) ; python_version < "3.11"
+Requires-Dist: numpy (>=2.3.4) ; python_version >= "3.11" and python_version < "4.0"
+Requires-Dist: publicsuffixlist (>=1.0.2.20251015)
 Requires-Dist: requests-toolbelt (>=1.0.0,<2.0.0)
 Requires-Dist: six (>=1.17.0) ; extra == "docs"
 Requires-Dist: tinycss2 (>=1.4.0)

{har2tree-1.32.1 → har2tree-1.34.0}/har2tree/har2tree.py

@@ -118,7 +118,11 @@ class HarFile():
                 last_redirect = unquote_plus(_lr.read())
             self.final_redirect: str = last_redirect
             if not self._search_final_redirect():
-                self.logger.warning(f'Final redirect URL from address bar not in tree: {last_redirect}')
+                if last_redirect.startswith('chrome') or last_redirect.startswith('about'):
+                    # the capture failed.
+                    pass
+                else:
+                    self.logger.info(f'Final redirect URL from address bar not in tree: {last_redirect}')
         else:
             self.logger.debug('No last_redirect file available.')
             self.final_redirect = ''

{har2tree-1.32.1 → har2tree-1.34.0}/har2tree/nodes.py

@@ -485,6 +485,7 @@ class URLNode(HarTreeNode):
 
             # Common JS redirect we can catch easily
             # NOTE: it is extremely fragile and doesn't work very often but is kinda better than nothing.
+            # NOTE 2025-08-30: Also, finding that doesn't mean it is in a part of the code that is executed without user interaction. It can be triggered after a user fills a form for example.
             # Source: https://stackoverflow.com/questions/13363174/regular-expression-to-catch-as-many-javascript-redirections-as-possible
             regex = re.compile(br"""((location.href)|(window.location)|(location.replace)|(location.assign))(( ?= ?)|( ?\( ?))("|')([^'"]*)("|')( ?\) ?)?;""", re.I)
             matches = re.findall(regex, self.body.getvalue())

{har2tree-1.32.1 → har2tree-1.34.0}/pyproject.toml

@@ -1,32 +1,31 @@
 [project]
 name = "har2tree"
-version = "1.32.1"
+version = "1.34.0"
 description = "HTTP Archive (HAR) to ETE Toolkit generator"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
 ]
 license = "BSD-3-Clause"
 readme = "README.md"
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 
 dynamic = [ "classifiers" ]
 
 dependencies = [
     "ete3 (>=3.1.3)",
-    "beautifulsoup4[charset-normalizer,lxml] (>=4.13.5)",
-    "publicsuffixlist (>=1.0.2.20250824)",
+    "beautifulsoup4[charset-normalizer,lxml] (>=4.14.2)",
+    "publicsuffixlist (>=1.0.2.20251015)",
     "filetype (>=1.2.0)",
-    # poetry up fails with the version of numpy forced for python < 3.10.
+    # poetry up fails with the version of numpy forced for python < 3.11.
     # The work around is to comment it, run poetry up, uncomment it. and run poetry update.
-    "numpy (<2.1) ; python_version < \"3.10\"",
-    "numpy (<2.3) ; python_version < \"3.11\"",
-    "numpy (>=2.3.2) ; python_version >= \"3.11\"",
+    "numpy (>=2.2,<2.3) ; python_version < '3.11'",
+    "numpy (>=2.3.4) ; python_version >= \"3.11\" and python_version < \"4.0\"",
     "w3lib (>=2.3.1)",
     "tinycss2 (>=1.4.0)",
-    "legacy-cgi (>=2.6.3) ; python_version >= \"3.13,<4.0\"",
+    "legacy-cgi (>=2.6.3) ; python_version >= '3.13' and python_version < '4.0'",
     "multipart (>=1.3.0,<2.0.0)",
     "json-stream (>=2.3.3,<3.0.0)",
-    "requests-toolbelt (>=1.0.0,<2.0.0)",
+    "requests-toolbelt (>=1.0.0,<2.0.0)"
 ]
 
 [project.urls]
@@ -48,9 +47,9 @@ classifiers = [
 docs = ["Sphinx (>=8.2.3) ; python_version >= \"3.11\"", "six (>=1.17.0)"]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.17.1"
-pytest-cov = "^6.2.1"
-coverage = "^7.10.5"
+mypy = "^1.18.2"
+pytest-cov = "^7.0.0"
+coverage = "^7.11.0"
 types-beautifulsoup4 = "^4.12.0.20250516"
 
 [build-system]