diff --git a/plexpy/helpers.py b/plexpy/helpers.py index 486be759..a3257403 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -28,7 +28,7 @@ from cloudinary.api import delete_resources_by_tag from cloudinary.uploader import upload from cloudinary.utils import cloudinary_url from collections import OrderedDict -import datetime +from datetime import date, datetime, timezone from functools import reduce, wraps import hashlib import imghdr @@ -222,14 +222,14 @@ def timestamp(): def today(): - today = datetime.date.today() - yyyymmdd = datetime.date.isoformat(today) + today = date.today() + yyyymmdd = date.isoformat(today) return yyyymmdd def utc_now_iso(): - utcnow = datetime.datetime.utcnow() + utcnow = datetime.now(tz=timezone.utc).replace(tzinfo=None) return utcnow.isoformat() @@ -246,7 +246,7 @@ def timestamp_to_YMDHMS(ts, sep=False): def timestamp_to_datetime(ts): - return datetime.datetime.fromtimestamp(ts) + return datetime.fromtimestamp(ts) def iso_to_YMD(iso): @@ -258,7 +258,7 @@ def iso_to_datetime(iso): def datetime_to_iso(dt, to_date=False): - if isinstance(dt, datetime.datetime): + if isinstance(dt, datetime): if to_date: dt = dt.date() return dt.isoformat() diff --git a/plexpy/webauth.py b/plexpy/webauth.py index 5487f2ea..c3c3f7e2 100644 --- a/plexpy/webauth.py +++ b/plexpy/webauth.py @@ -378,7 +378,7 @@ class AuthController(object): if valid_login: time_delta = timedelta(days=30) if remember_me == '1' else timedelta(minutes=60) - expiry = datetime.utcnow() + time_delta + expiry = datetime.now() + time_delta payload = { 'user_id': user_details['user_id'],