Skip to content

fix relative_to on internal paths #2520

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

Open
cebtenzzre wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −5
Open

fix relative_to on internal paths #2520

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
13 changes: 8 additions & 5 deletions appdaemon/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,14 @@ def user_exception_block(logger: Logger, exception: Exception, app_dir: Path | N
logger.error(f"{indent}{exc.__class__.__name__}: {exc}")
if tb := traceback.extract_tb(exc.__traceback__):
frame = tb[-1]
file = Path(frame.filename).relative_to(app_dir.parent)
logger.error(f"{indent} line {frame.lineno} in {file.name}")
logger.error(f"{indent} {frame._line.rstrip()}")
error_len = frame.end_colno - frame.colno
logger.error(f"{indent} {' ' * (frame.colno - 1)}{'^' * error_len}")
file_path = Path(frame.filename)
# Only show file details if it's in the user's app directory
if file_path.is_relative_to(app_dir.parent):
file = file_path.relative_to(app_dir.parent)
logger.error(f"{indent} line {frame.lineno} in {file.name}")
logger.error(f"{indent} {frame._line.rstrip()}")
error_len = frame.end_colno - frame.colno
logger.error(f"{indent} {' ' * (frame.colno - 1)}{'^' * error_len}")
case SyntaxError():
logger.error(f"{indent}{exc.__class__.__name__}: {exc}")
logger.error(f"{indent} {exc.text.rstrip()}")
Expand Down
Loading