Skip to content

Commit ba41a7b

Browse files
Merge pull request #155 from mdujava/utcnow
Fix offset-naive and offset-aware operation
2 parents 226c847 + ee565dc commit ba41a7b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ansible/rebuild_module.digest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e02b625904721101e2eda533799da9d9 -
1+
24c9a929926b980e06186bcfc4e7eca4 -

ansible/roles/openshift_client_python/library/openshift_client_python.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openshift_client/action.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def oc_action(context, verb, cmd_args=None, all_namespaces=False, no_namespace=F
291291
return_code = -1
292292

293293
start_time = time.time()
294-
exec_time = int((datetime.datetime.now(datetime.timezone.utc) - datetime.datetime(1970, 1, 1)).total_seconds() * 1000)
294+
exec_time = int((datetime.datetime.now(datetime.timezone.utc) - datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)).total_seconds() * 1000)
295295

296296
if context.get_ssh_client() is not None:
297297
references['.client_host'] = '{}@{}'.format(context.get_ssh_username() or '', context.get_ssh_hostname())

0 commit comments

Comments
 (0)