Skip to content

Fixes 'empty' return #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brgix merged 1 commit into from
Jul 17, 2025
Merged

Fixes 'empty' return #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
30 changes: 15 additions & 15 deletions src/oslg/oslg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -444,7 +444,7 @@ def empty(id="", mth="", lvl=CN.DEBUG, res=None):

log(lvl, "Empty '%s' (%s)" % (id, mth))

res
return res
Copy link
Member Author

@brgix brgix Jul 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes - Ruby relic:

  • before fix: method returned None in all cases.
  • after fix: method returns user-provided object (last argument, defaults to None).



def zero(id="", mth="", lvl=CN.DEBUG, res=None):
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_oslg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down