updates

Author: TimSVector

getjobs.py

@@ -232,17 +232,17 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
 
 def printEnvironmentInfo(ManageProjectName, printData = True, printEnvType = False):
     try:
+            
         from vector.apps.DataAPI.vcproject_api import VCProjectApi
-        with VCProjectApi(ManageProjectName) as vcproj:
-            ret_info = printEnvInfoDataAPI(vcproj, printData, printEnvType)
-
+        api = VCProjectApi(ManageProjectName)
+        ret_info = printEnvInfoDataAPI(api, printData, printEnvType)
+        api.close()
         return ret_info
+
 
-    except Exception as e:    
-        print(e)
+    except:    
         return printEnvInfoNoDataAPI(ManageProjectName, printData, printEnvType)
-        
-        
+
 if __name__ == "__main__":
     import argparse
     parser = argparse.ArgumentParser()

incremental_build_report_aggregator.py

@@ -177,19 +177,30 @@ 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 Exception("No <table> elements found in {}".format(current_file))
+                raise LookupError("No <table> elements found in {}".format(current_file))
 
             if main_soup.find(id="report-title"):
                 main_manage_api_report = True
@@ -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"
+
+            soup = BeautifulSoup(raw, features=parser)
+
+        except Exception:
+            try:
+                # Fallback to UTF-8
+                soup = BeautifulSoup(
+                    raw.encode("utf-8", "replace"),
+                    features=parser
+                )
+            except Exception:
+                # Final fallback: use whatever parser is available, no feature string
+                soup = BeautifulSoup(
+                    raw.encode(encFmt, "replace")
+                )
 
         try:
             if soup.find(id="report-title"):