From 212149f47e7e8e9d9cbbe75a2656ded1e07e5e08 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Feb 15 2019 13:25:58 +0000
Subject: Fix tests and python3 support.


---

diff --git a/server/odcs/server/mbs.py b/server/odcs/server/mbs.py
index b44fe92..2fad822 100644
--- a/server/odcs/server/mbs.py
+++ b/server/odcs/server/mbs.py
@@ -23,7 +23,7 @@
 import requests
 from collections import defaultdict
 
-import odcs.server.utils
+from odcs.server.utils import retry, to_text_type
 from odcs.server import log
 
 import gi
@@ -39,7 +39,7 @@ class MBS(object):
     def __init__(self, config):
         self.mbs_url = config.mbs_url.rstrip("/")
 
-    @odcs.server.utils.retry(wait_on=(requests.ConnectionError, ), logger=log)
+    @retry(wait_on=(requests.ConnectionError, ), logger=log)
     def get_modules(self, **params):
         url = self.mbs_url + "/1/module-builds/"
         r = requests.get(url, params=params)
@@ -99,7 +99,7 @@ class MBS(object):
                 mmd.upgrade()
                 for dep in mmd.get_dependencies():
                     dep.add_requires_single(mmd.get_name(), mmd.get_stream())
-                module["modulemd"] = unicode(mmd.dumps())
+                module["modulemd"] = to_text_type(mmd.dumps())
             ret.append(module)
         return ret
 
diff --git a/server/odcs/server/pungi.py b/server/odcs/server/pungi.py
index baf4f7d..77c9ad4 100644
--- a/server/odcs/server/pungi.py
+++ b/server/odcs/server/pungi.py
@@ -197,7 +197,7 @@ class PungiConfig(BasePungiConfig):
             # If it is -devel module, there must exist the non-devel
             # counterpart.
             non_devel_nsvc = ":".join([n[:-len("-devel")], s, v, c])
-            if not non_devel_nsvc in source_list:
+            if non_devel_nsvc not in source_list:
                 new_source.append(nsvc)
                 continue
 
diff --git a/server/odcs/server/utils.py b/server/odcs/server/utils.py
index 8d3bee6..0294aef 100644
--- a/server/odcs/server/utils.py
+++ b/server/odcs/server/utils.py
@@ -28,10 +28,21 @@ import time
 import subprocess
 import shutil
 from threading import Timer
+from six import text_type
 
 from odcs.server import conf, log
 
 
+def to_text_type(s):
+    """
+    Converts `s` to `text_type`. In case it fails, returns `s`.
+    """
+    try:
+        return text_type(s, "utf-8")
+    except TypeError:
+        return s
+
+
 def retry(timeout=conf.net_timeout, interval=conf.net_retry_interval, wait_on=Exception, logger=None):
     """A decorator that allows to retry a section of code until success or timeout."""
     def wrapper(function):