diff --git a/pyproject.toml b/pyproject.toml index 99162a1..fc951ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "oslg" -version = "0.3.2" +version = "0.3.3" description = "OpenStudio SDK logger for Python" readme = "README.md" requires-python = ">=3.2" diff --git a/src/oslg/oslg.py b/src/oslg/oslg.py index 4db575f..ca2d1f9 100644 --- a/src/oslg/oslg.py +++ b/src/oslg/oslg.py @@ -92,12 +92,12 @@ def trim(txt="", length=160) -> str: """ try: length = int(length) - except Exception: + except: length = 160 try: txt = str(txt).strip()[:length] - except Exception: + except: txt = "" return txt @@ -158,7 +158,7 @@ def tag(lvl=_level) -> str: """ try: lvl = int(lvl) - except Exception: + except: return _tag[0] if not 0 <= lvl < len(_tag): @@ -182,7 +182,7 @@ def msg(stat=_status) -> str: """ try: stat = int(stat) - except Exception: + except: return _msg[0] if not 0 <= stat < len(_msg): @@ -208,7 +208,7 @@ def reset(lvl=CN.DEBUG) -> int: try: lvl = int(lvl) - except Exception: + except: return _level if CN.DEBUG <= lvl <= CN.FATAL: @@ -242,12 +242,12 @@ def log(lvl=CN.DEBUG, message="", length=160) -> int: try: lvl = int(lvl) - except Exception: + except: return _status try: length = int(length) - except Exception: + except: return _status if length > 160: length = 160 @@ -294,12 +294,12 @@ def invalid(id="", mth="", ord=0, lvl=CN.DEBUG, res=None): try: ord = int(ord) - except Exception: + except: return res try: lvl = int(lvl) - except Exception: + except: return res if not id or not mth or lvl < CN.DEBUG or lvl > CN.FATAL: @@ -346,7 +346,7 @@ def mismatch(id="", obj=None, cl=None, mth="", lvl=CN.DEBUG, res=None): try: lvl = int(lvl) - except Exception: + except: return res if not id: return res @@ -394,7 +394,7 @@ def hashkey(id="", dct={}, key="", mth="", lvl=CN.DEBUG, res=None): try: lvl = int(lvl) - except Exception: + except: return res if not id: return res @@ -434,7 +434,7 @@ def empty(id="", mth="", lvl=CN.DEBUG, res=None): try: lvl = int(lvl) - except Exception: + except: return res if not id: return res @@ -444,7 +444,7 @@ def empty(id="", mth="", lvl=CN.DEBUG, res=None): log(lvl, "Empty '%s' (%s)" % (id, mth)) - res + return res def zero(id="", mth="", lvl=CN.DEBUG, res=None): @@ -472,7 +472,7 @@ def zero(id="", mth="", lvl=CN.DEBUG, res=None): try: lvl = int(lvl) - except Exception: + except: return res if not id: return res @@ -510,7 +510,7 @@ def negative(id="", mth="", lvl=CN.DEBUG, res=None): try: lvl = int(lvl) - except Exception: + except: return res if not id: return res diff --git a/tests/test_oslg.py b/tests/test_oslg.py index bb5ca14..0480490 100644 --- a/tests/test_oslg.py +++ b/tests/test_oslg.py @@ -147,7 +147,7 @@ def test06_oslg_empty_argument_log(self): m1 = "Empty 'hash' (area)" self.assertEqual(oslg.level(), INF) self.assertFalse(oslg.logs()) - self.assertEqual(oslg.empty("hash", "area", ERR), None) + self.assertEqual(oslg.empty("hash", "area", ERR, []), []) self.assertFalse(oslg.is_info()) self.assertTrue(oslg.is_error()) self.assertEqual(oslg.status(), ERR)