From bb2cbabab19e89d823bbd171d19479abd31be5a7 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 24 Sep 2024 14:00:31 -0700 Subject: [PATCH 1/3] Reclassifying ERRORS in data generation - see issue #238 --- testgen/generators/base.py | 2 +- testgen/generators/datetime_fmt.py | 2 +- testgen/generators/list_fmt.py | 2 +- testgen/generators/relativedatetime_fmt.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testgen/generators/base.py b/testgen/generators/base.py index 99d8a853..c187b33e 100644 --- a/testgen/generators/base.py +++ b/testgen/generators/base.py @@ -136,7 +136,7 @@ def readFile(self, filename, version="", filetype="txt"): with open(path, "r", encoding="utf-8") as testdata: return json.load(testdata) if filetype == "json" else testdata.read() except BaseException as err: - logging.warning("** READ: Error = %s", err) + logging.warning("** readFile: %s", err) return None def computeMaxDigitsForCount(self, count): diff --git a/testgen/generators/datetime_fmt.py b/testgen/generators/datetime_fmt.py index fae7addb..449af3fe 100644 --- a/testgen/generators/datetime_fmt.py +++ b/testgen/generators/datetime_fmt.py @@ -29,7 +29,7 @@ def process_test_data(self): ] if self.icu_version not in icu_nvm_versions: - logging.error('Generating datetime data not configured for icu version %s', self.icu_version) + logging.warning('Generating datetime data not configured for icu version %s', self.icu_version) return False # Set up Node version and call the generator diff --git a/testgen/generators/list_fmt.py b/testgen/generators/list_fmt.py index 9dd1401f..258b1c92 100644 --- a/testgen/generators/list_fmt.py +++ b/testgen/generators/list_fmt.py @@ -29,7 +29,7 @@ def process_test_data(self): ] if self.icu_version not in icu_nvm_versions: - logging.error('Generating list_fmt data not configured for icu version %s', self.icu_version) + logging.warning('Generating list_fmt data not configured for icu version %s', self.icu_version) return False # Set up Node version and call the generator diff --git a/testgen/generators/relativedatetime_fmt.py b/testgen/generators/relativedatetime_fmt.py index 34729894..7480f5b7 100644 --- a/testgen/generators/relativedatetime_fmt.py +++ b/testgen/generators/relativedatetime_fmt.py @@ -29,7 +29,7 @@ def process_test_data(self): ] if self.icu_version not in icu_nvm_versions: - logging.error('Generating relative date/time data not configured for icu version %s', self.icu_version) + logging.warning('Generating relative date/time data not configured for icu version %s', self.icu_version) return False # Set up Node version and call the generator From bb879c81c9af6b39be3221cf8ddd57ef7c7202d4 Mon Sep 17 00:00:00 2001 From: sven-oly Date: Sat, 6 Sep 2025 00:23:55 +0000 Subject: [PATCH 2/3] Change exception type --- testgen/generators/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testgen/generators/base.py b/testgen/generators/base.py index c187b33e..6616cafa 100644 --- a/testgen/generators/base.py +++ b/testgen/generators/base.py @@ -135,7 +135,7 @@ def readFile(self, filename, version="", filetype="txt"): try: with open(path, "r", encoding="utf-8") as testdata: return json.load(testdata) if filetype == "json" else testdata.read() - except BaseException as err: + except Exception as err: logging.warning("** readFile: %s", err) return None From 66bd66b8bcd4011c6260490d51bb86a70d283cee Mon Sep 17 00:00:00 2001 From: sven-oly Date: Thu, 9 Oct 2025 00:12:25 +0000 Subject: [PATCH 3/3] Fix type of exceptions --- testgen/generators/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testgen/generators/base.py b/testgen/generators/base.py index 6616cafa..bdb73f26 100644 --- a/testgen/generators/base.py +++ b/testgen/generators/base.py @@ -49,7 +49,7 @@ def generateTestHashValues(self, testdata): try: all_tests = testdata['tests'] - except BaseException as error: + except Exception as error: logging.error('# generateTestHashValues: %s does not have "tests": %s', error, testdata.keys()) return None @@ -57,7 +57,7 @@ def generateTestHashValues(self, testdata): for test in all_tests: try: test_no_label = test.copy() - except BaseException as error: + except Exception as error: logging.error('error: %s, Item with no label found here: %s, %s' , error, testdata['test_type'], test) continue @@ -107,7 +107,7 @@ def getTestDataFromGitHub(self, datafile_name, version): ) return None return r.text - except BaseException as err: + except Exception as err: logging.warning( "Warning: cannot load data %s for version %s. Error = %s", datafile_name,