Merge pull request #152 from bradmwilliams/latest-changes

[Cherry-pick] Use datetime.now with timezone, instead of datetime.utcnow

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-da9318acdd6e31b0b1b2918f0ba5a8d1  -
+41981ed31938fe604792f252c4cf0e5d  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -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())

packages/openshift/action.py

@@ -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
 
@@ -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
@@ -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:
@@ -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