From ad0f3c434190667ee26b77849bb7d823d1557292 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jul 21 2017 08:53:48 +0000
Subject: Python 3 fixes


---

diff --git a/koschei/backend/__init__.py b/koschei/backend/__init__.py
index 6474ddf..6be066b 100644
--- a/koschei/backend/__init__.py
+++ b/koschei/backend/__init__.py
@@ -213,7 +213,7 @@ def register_real_builds(session, collection, package_build_infos):
                 )
             )
         # insert valid builds
-        session.db.bulk_insert(build_tasks.keys())
+        session.db.bulk_insert(list(build_tasks.keys()))
         # set build_ids of new koji tasks
         for build, tasks in build_tasks.items():
             for task in tasks:
diff --git a/koschei/backend/services/resolver.py b/koschei/backend/services/resolver.py
index 609ced1..e6d21ca 100644
--- a/koschei/backend/services/resolver.py
+++ b/koschei/backend/services/resolver.py
@@ -648,7 +648,8 @@ class Resolver(Service):
             collection.build_tag,
         )
 
-        if latest_repo and latest_repo.get('id', 0) > collection.latest_repo_id:
+        if latest_repo and (not collection.latest_repo_id or
+                            latest_repo.get('id', 0) > collection.latest_repo_id):
             if not collection.secondary_mode:
                 return latest_repo['id']
             else:
diff --git a/koschei/session.py b/koschei/session.py
index 1b4fe58..070cefb 100644
--- a/koschei/session.py
+++ b/koschei/session.py
@@ -37,7 +37,9 @@ class KoscheiSession(object):
             with _cache_creation_lock:
                 if cache_id not in self._caches:
                     cache = dogpile.cache.make_region(
-                        key_mangler=dogpile.cache.util.sha1_mangle_key,
+                        key_mangler=(
+                            lambda key: dogpile.cache.util.sha1_mangle_key(key.encode())
+                        ),
                     )
                     cache.configure(**get_config('caching.' + cache_id))
                     self._caches[cache_id] = cache
diff --git a/koschei/util.py b/koschei/util.py
index e79af7e..255d224 100644
--- a/koschei/util.py
+++ b/koschei/util.py
@@ -119,7 +119,7 @@ def sd_notify(msg):
 
 def merge_sorted(iterable1, iterable2, key):
     """Merge two sorted iterables."""
-    iters = [iter(g) for g in iterable1, iterable2]
+    iters = [iter(g) for g in (iterable1, iterable2)]
     heads = [next(iterator, None) for iterator in iters]
     while heads[0] or heads[1]:
         index = 0 if heads[0] and (not heads[1] or key(heads[0]) < key(heads[1])) else 1
diff --git a/test/api_test.py b/test/api_test.py
index 3e52176..e06b8db 100644
--- a/test/api_test.py
+++ b/test/api_test.py
@@ -16,8 +16,10 @@
 #
 # Author: Mikolaj Izdebski <mizdebsk@redhat.com>
 
+from __future__ import absolute_import
+
 from flask import json
-from frontend_test import FrontendTest
+from test.frontend_test import FrontendTest
 from koschei.models import Collection
 
 
diff --git a/test/backend_test.py b/test/backend_test.py
index 476f941..6c4cc1f 100644
--- a/test/backend_test.py
+++ b/test/backend_test.py
@@ -16,7 +16,6 @@
 #
 # Author: Michael Simacek <msimacek@redhat.com>
 
-import koji
 import six
 
 from copy import deepcopy