Skip to content

{Core} Fix _normalize_expires_on on Python 3.6 #20874

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
jiasli merged 2 commits into from
Dec 30, 2021
Merged

{Core} Fix _normalize_expires_on on Python 3.6 #20874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32b728b
Fix _normalize_expires_on on Python 3.6
jiasli Dec 30, 2021
eb2bcb7
pylint
jiasli Dec 30, 2021
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: 7 additions & 0 deletions src/azure-cli-core/azure/cli/core/auth/adal_authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ def _normalize_expires_on(expires_on):
expires_on_epoch_int = int(expires_on)
except ValueError:
import datetime

# Python 3.6 doesn't recognize timezone as +00:00.
# These lines can be dropped after Python 3.6 is dropped.
# https://stackoverflow.com/questions/30999230/how-to-parse-timezone-with-colon
if expires_on[-3] == ":":
expires_on = expires_on[:-3] + expires_on[-2:]

# Treat as datetime string "11/05/2021 15:18:31 +00:00"
expires_on_epoch_int = int(datetime.datetime.strptime(expires_on, '%m/%d/%Y %H:%M:%S %z').timestamp())

Expand Down