Skip to content

Use built-in isoformat support #383

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
Evidlo merged 1 commit into from
Mar 11, 2024
Merged

Use built-in isoformat support #383

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
7 changes: 3 additions & 4 deletions pykeepass/pykeepass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
BLANK_DATABASE_FILENAME = "blank_database.kdbx"
BLANK_DATABASE_LOCATION = os.path.join(os.path.dirname(os.path.realpath(__file__)), BLANK_DATABASE_FILENAME)
BLANK_DATABASE_PASSWORD = "password"
DT_ISOFORMAT = "%Y-%m-%dT%H:%M:%S%fZ"

class PyKeePass():
"""Open a KeePass database
Expand Down Expand Up @@ -804,7 +803,7 @@ def _encode_time(self, value):
struct.pack('<Q', diff_seconds)
).decode('utf-8')
else:
return value.strftime(DT_ISOFORMAT)
return value.isoformat()

def _decode_time(self, text):
"""datetime.datetime: Convert base64 time or plaintext time to datetime"""
Expand All @@ -819,9 +818,9 @@ def _decode_time(self, text):
)
)
except BinasciiError:
return datetime.strptime(text, DT_ISOFORMAT).replace(tzinfo=timezone.utc)
return datetime.fromisoformat(text.replace('Z','+00:00')).replace(tzinfo=timezone.utc)
else:
return datetime.strptime(text, DT_ISOFORMAT).replace(tzinfo=timezone.utc)
return datetime.fromisoformat(text.replace('Z','+00:00')).replace(tzinfo=timezone.utc)

def create_database(
filename, password=None, keyfile=None, transformed_key=None
Expand Down