Merge ~hloeung/container-log-archive-charm:master into container-log-archive-charm:master

[Haw Loeung]

python3-ify for Focal support

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Paul Collins (pjdc)]

Land at will.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision b874095cf7070027b2a63e318ab4a48871d78b16

diff --git a/files/check-log-archive-status b/files/check-log-archive-status
index 305741e..5aedb84 100755
--- a/files/check-log-archive-status
+++ b/files/check-log-archive-status
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Check the status of the last container-log-archive run
 
@@ -6,18 +6,22 @@ import sys
 import os.path
 import datetime
 
+
 def critical(msg):
-    print "CRITICAL: " + msg
+    print("CRITICAL: " + msg)
     sys.exit(2)
 
+
 def warning(msg):
-    print "WARNING: " + msg
+    print("WARNING: " + msg)
     sys.exit(1)
 
+
 def ok(msg):
-    print "OK: " + msg
+    print("OK: " + msg)
     sys.exit(0)
 
+
 try:
     status_file = sys.argv[1]
 except IndexError:
diff --git a/metadata.yaml b/metadata.yaml
index a74e46f..276a1aa 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,6 +7,7 @@ description: |
 series:
   - xenial
   - bionic
+  - focal
 tags:
   - miscellaneous
 subordinate: true
diff --git a/scripts/charm_helpers_sync.py b/scripts/charm_helpers_sync.py
index b5e7d95..87b422b 100755
--- a/scripts/charm_helpers_sync.py
+++ b/scripts/charm_helpers_sync.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2013 Canonical Ltd.
 
 # Authors:
@@ -22,7 +22,7 @@ def parse_config(conf_file):
     if not os.path.isfile(conf_file):
         logging.error('Invalid config file: %s.' % conf_file)
         return False
-    return yaml.load(open(conf_file).read())
+    return yaml.safe_load(open(conf_file).read())
 
 
 def clone_helpers(work_dir, branch):
@@ -215,7 +215,7 @@ if __name__ == '__main__':
         checkout = clone_helpers(tmpd, config['branch'])
         sync_helpers(config['include'], checkout, config['destination'],
                      options=sync_options)
-    except Exception, e:
+    except Exception as e:
         logging.error("Could not sync: %s" % e)
         raise e
     finally: