Skip to content
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

Jump to bottom

json: do not make sqlalchemy a hard requirement #813

Merged
merged 1 commit into from
Dec 17, 2021
Merged

json: do not make sqlalchemy a hard requirement #813

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions keylime/json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@

_list_types.append(Row)
except ModuleNotFoundError:
from sqlalchemy.engine import RowProxy
try:
from sqlalchemy.engine import RowProxy

_list_types.append(RowProxy)
_list_types.append(RowProxy)
except ModuleNotFoundError:
pass


def __bytes_to_str(data):
Expand Down