Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ansible/rebuild_module.digest
Original file line number Diff line number Diff line change
@@ -1 +1 @@
95d5ecc9863064e6039b3c5f1213ad9e -
e7d43169f7b71cfc9f85275fc03e7702 -

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/openshift_client/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def oc_action(context, verb, cmd_args=None, all_namespaces=False, no_namespace=F
return_code = -1

start_time = time.time()
exec_time = int((datetime.datetime.utcnow() - datetime.datetime(1970, 1, 1)).total_seconds() * 1000)
exec_time = int((datetime.datetime.now(datetime.timezone.utc) - datetime.datetime(1970, 1, 1)).total_seconds() * 1000)

if context.get_ssh_client() is not None:
references['.client_host'] = '{}@{}'.format(context.get_ssh_username() or '', context.get_ssh_hostname())
Expand Down
8 changes: 4 additions & 4 deletions packages/openshift_client/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import inspect
import os

from datetime import datetime
from datetime import datetime, timezone
from datetime import timedelta
from threading import local

Expand Down Expand Up @@ -248,7 +248,7 @@ def get_out_of_time(self):
# Unlike most context methods, timeout methods use cur_context instead of self.
# This allows selectors/apiobjects captured in one timeout block to be used in another.
c = cur_context()
now = datetime.utcnow()
now = datetime.now(timezone.utc)
while c is not None:
if c.timeout_datetime is not None and now > c.timeout_datetime:
return True, c
Expand All @@ -267,7 +267,7 @@ def get_min_remaining_seconds(self):
# This allows selectors/apiobjects captured in one timeout block to be used in another.
c = cur_context()
min_secs = None
now = datetime.utcnow()
now = datetime.now(timezone.utc)
limiting_context = None
while c is not None:
if c.timeout_datetime is not None:
Expand Down Expand Up @@ -325,7 +325,7 @@ def set_timeout(self, seconds):
:return: N/A
"""
if seconds and seconds > 0:
self.timeout_datetime = datetime.utcnow() + timedelta(seconds=seconds)
self.timeout_datetime = datetime.now(timezone.utc) + timedelta(seconds=seconds)
else:
self.timeout_datetime = None

Expand Down