updates from testing

Author: TimSVector

src/main/resources/scripts/cobertura.py

@@ -26,9 +26,11 @@
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi 
     from vector.apps.DataAPI.vcproject_models import VCProject
-    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
+
+from vector.apps.DataAPI.cover_api import CoverApi
+
 try:
     from vector.apps.DataAPI.unit_test_api import UnitTestApi
 except:

src/main/resources/scripts/fixup_reports.py

@@ -112,17 +112,27 @@ def fixup_2020_reports(report_name):
         raw = fd.read().decode(encFmt, "replace")
 
     try:
-        # First attempt: use whatever encoding was detected
-        main_soup = BeautifulSoup(raw, features="lxml")
+        # First attempt: use lxml if available, else let BS pick
+        try:
+            import lxml  # noqa
+            parser = "lxml"
+        except ImportError:
+            parser = "html.parser"
+
+        main_soup = BeautifulSoup(raw, features=parser)
 
-    except Exception as e:
+    except Exception:
         try:
-            # Try UTF-8 first as a fallback (should rarely fail if raw is text)
-            main_soup = BeautifulSoup(raw.encode("utf-8", "replace"), "lxml")
+            # Fallback to UTF-8
+            main_soup = BeautifulSoup(
+                raw.encode("utf-8", "replace"),
+                features=parser
+            )
         except Exception:
-            # Last resort: try system default encoding (ACP on Windows, etc.)
-            main_soup = BeautifulSoup(raw.encode(encFmt, "replace"), "lxml")
-    
+            main_soup = BeautifulSoup(
+                raw.encode(encFmt, "replace")
+            )
+        
     main_soup = fixup_2020_soup(main_soup)
 
     with open(report_name, "wb") as fd:

src/main/resources/scripts/generate_lcov.py

@@ -26,9 +26,11 @@
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi 
     from vector.apps.DataAPI.vcproject_models import VCProject
-    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
+
+from vector.apps.DataAPI.cover_api import CoverApi
+
 try:
     from vector.apps.DataAPI.unit_test_api import UnitTestApi
 except:

src/main/resources/scripts/generate_sonarqube_testresults.py

@@ -45,10 +45,11 @@
 
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi
-    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
 
+from vector.apps.DataAPI.cover_api import CoverApi
+
 from vector.enums import ENVIRONMENT_STATUS_TYPE_T
 
 try:

src/main/resources/scripts/generate_xml.py

@@ -44,10 +44,11 @@
 
 try:
     from vector.apps.DataAPI.vcproject_api import VCProjectApi
-    from vector.apps.DataAPI.cover_api import CoverApi
 except:
     pass
 
+from vector.apps.DataAPI.cover_api import CoverApi
+
 try:
     from vector.apps.ReportBuilder.custom_report import fmt_percent
 except:

src/main/resources/scripts/incremental_build_report_aggregator.py

@@ -177,16 +177,27 @@ def log(msg, level="info"):
 
             # Parse with fallback encodings
             try:
-                main_soup = BeautifulSoup(raw, features="lxml", from_encoding=encFmt)
-            except Exception as e1:
-                log("[WARN] Parsing with {} failed: {}".format(encFmt, e1))
+                # First attempt: use lxml if available, else let BS pick
                 try:
-                    main_soup = BeautifulSoup(raw, features="lxml", from_encoding="utf-8")
-                    log("[INFO] Parsed successfully with UTF-8 fallback.")
-                except Exception as e2:
-                    log("[ERROR] UTF-8 parse also failed: {}".format(e2))
-                    main_soup = BeautifulSoup(raw, features="lxml", from_encoding=encFmt)
-                    log("[INFO] Retrying parse with original encoding fallback.")
+                    import lxml  # noqa
+                    parser = "lxml"
+                except ImportError:
+                    parser = "html.parser"
+
+                main_soup = BeautifulSoup(raw, features=parser)
+
+            except Exception:
+                try:
+                    # Fallback to UTF-8
+                    main_soup = BeautifulSoup(
+                        raw.encode("utf-8", "replace"),
+                        features=parser
+                    )
+                except Exception:
+                    # Final fallback: use whatever parser is available, no feature string
+                    main_soup = BeautifulSoup(
+                        raw.encode(encFmt, "replace")
+                    )
 
             if len(main_soup.find_all('table')) < 1:
                 raise LookupError("No <table> elements found in {}".format(current_file))
@@ -250,20 +261,27 @@ def log(msg, level="info"):
 
         soup = None
         try:
-            soup = BeautifulSoup(raw, features="lxml", from_encoding=encFmt)
-        except Exception as e1:
-            log("[WARN] Parsing with {} failed: {}".format(encFmt, e1))
+            # First attempt: use lxml if available, else let BS pick
             try:
-                soup = BeautifulSoup(raw, features="lxml", from_encoding="utf-8")
-                log("[INFO] Parsed successfully with UTF-8 fallback.")
-            except Exception as e2:
-                log("[ERROR] UTF-8 parse failed: {}".format(e2))
-                try:
-                    soup = BeautifulSoup(raw, features="lxml", from_encoding=encFmt)
-                    log("[INFO] Retried parse with {} encoding.".format(encFmt))
-                except Exception as e3:
-                    log("[FATAL] Could not parse report '{}': {}".format(file, e3))
-                    continue
+                import lxml  # noqa
+                parser = "lxml"
+            except ImportError:
+                parser = "html.parser"
+
+            main_soup = BeautifulSoup(raw, features=parser)
+
+        except Exception:
+            try:
+                # Fallback to UTF-8
+                main_soup = BeautifulSoup(
+                    raw.encode("utf-8", "replace"),
+                    features=parser
+                )
+            except Exception:
+                # Final fallback: use whatever parser is available, no feature string
+                main_soup = BeautifulSoup(
+                    raw.encode(encFmt, "replace")
+                )
 
         try:
             if soup.find(id="report-title"):

src/main/resources/scripts/parallel_full_reports.py

@@ -42,7 +42,8 @@
     import multiprocessing
     from vector.apps.DataAPI.unit_test_api import UnitTestApi
     from vector.apps.DataAPI.vcproject_api import VCProjectApi
-    from vector.apps.DataAPI.cover_api import CoverApi
+
+from vector.apps.DataAPI.cover_api import CoverApi
 
 
 def dump(obj):