From c1d93dd1962d68924efab288760322d56de9e0be Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Nov 13 2019 20:32:22 +0000
Subject: push-two-week-atomic.py py3


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/scripts/push-two-week-atomic.py b/scripts/push-two-week-atomic.py
index d573f04..1577335 100755
--- a/scripts/push-two-week-atomic.py
+++ b/scripts/push-two-week-atomic.py
@@ -290,7 +290,7 @@ def send_atomic_announce_email(
     msg['To'] = "; ".join(mail_receivers)
     msg['From'] = "noreply@fedoraproject.org"
     msg['Subject'] = "Fedora Atomic Host Two Week Release Announcement: %s" % \
-                         ostree_commit_data.items()[0][1]['version']
+                         ostree_commit_data[list(ostree_commit_data)[0]]['version']
     msg.attach(
         MIMEText(
             """
@@ -748,6 +748,7 @@ if __name__ == '__main__':
         cmd = ['/usr/bin/ostree', '--repo=' + ATOMIC_REPO,
                'show', '--print-metadata-key=version', commit]
         version = subprocess.check_output(cmd).strip()
+        version = version.decode("utf-8")
         # output will be in GVariant print format by default -> s/'//
         version = version.replace("'", "")
 
@@ -755,6 +756,7 @@ if __name__ == '__main__':
         cmd = ['/usr/bin/ostree', '--repo=' + ATOMIC_REPO,
                'rev-parse', ref]
         previous_commit = subprocess.check_output(cmd).strip()
+        previous_commit = previous_commit.decode("utf-8")
 
         # set info in ostree_commit_data dict
         ostree_commit_data[arch]['ref'] = ref
@@ -766,7 +768,7 @@ if __name__ == '__main__':
     log.info("%s", json.dumps(ostree_commit_data, indent=2))
 
     # Verify all versions match
-    ostree_commit_version = ostree_commit_data.items()[0][1]['version']
+    ostree_commit_version = ostree_commit_data[list(ostree_commit_data)[0]]['version']
     for arch in ARCHES:
         if ostree_commit_data[arch]['version'] != ostree_commit_version:
             log.error("Found mismatched versions for commits")