3.0.0 policy-handler - migrated to python 3.6

- migrated from python 2.7 to 3.6
- brought up the latest versions of dependencies
  -- Cherrypy 15.0.0, requests 2.18.4, websocket-client 0.48.0
- fixed migration errors
  -- renamed the standard package Queue to queue
  -- dict.items() instead of dict.iteritems()
  -- dict.keys() instead of dict.viewkeys()
  -- range() instead of xrange()
  -- subprocess.check_output(..., universal_newlines=True) to
     get str instead of byte-stream from stdout
- cleaned up migration warnings
  -- super() instead of super(A, self)
  -- logger.warning() instead of .warn()
- moved main() from policy_handler.py to __main__.py
- getting the policy_handler version directly from setup.py
  instead of the env var on init of the audit

Change-Id: I0fc4ddc51c08a64f3cfdc5d2f010b1c6a1ae92f0
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-515

1 files changed, 5 insertions, 5 deletions

diff --git a/policyhandler/policy_updater.py b/policyhandler/policy_updater.py
index 9f24d3d..cff7b41 100644
--- a/policyhandler/policy_updater.py
+++ b/policyhandler/policy_updater.py
@@ -21,7 +21,7 @@
 import copy
 import json
 import logging
-from Queue import Queue
+from queue import Queue
 from threading import Lock, Thread
 
 from .config import Config
@@ -206,14 +206,14 @@ class PolicyUpdater(Thread):
             catch_up_result = ""
             if not aud_catch_up.is_success():
                 catch_up_result = "- not sending catch-up to deployment-handler due to errors"
-                PolicyUpdater._logger.warn(catch_up_result)
+                PolicyUpdater._logger.warning(catch_up_result)
             elif not self._need_to_send_catch_up(aud_catch_up, catch_up_message):
                 catch_up_result = "- skipped sending the same policies"
             else:
                 DeployHandler.policy_update(aud_catch_up, catch_up_message, rediscover=True)
                 if not aud_catch_up.is_success():
                     catch_up_result = "- failed to send catch-up to deployment-handler"
-                    PolicyUpdater._logger.warn(catch_up_result)
+                    PolicyUpdater._logger.warning(catch_up_result)
                 else:
                     catch_up_result = "- sent catch-up to deployment-handler"
             success, _, _ = aud_catch_up.audit_done(result=catch_up_result)
@@ -255,13 +255,13 @@ class PolicyUpdater(Thread):
 
             if not queued_audit.is_success():
                 result = "- not sending policy-updates to deployment-handler due to errors"
-                PolicyUpdater._logger.warn(result)
+                PolicyUpdater._logger.warning(result)
             else:
                 message = {LATEST_POLICIES: updated_policies, REMOVED_POLICIES: removed_policies}
                 deployment_handler_changed = DeployHandler.policy_update(queued_audit, message)
                 if not queued_audit.is_success():
                     result = "- failed to send policy-updates to deployment-handler"
-                    PolicyUpdater._logger.warn(result)
+                    PolicyUpdater._logger.warning(result)
                 else:
                     result = "- sent policy-updates to deployment-handler"