From f205160244f2a093c6ba36c6c5bb562486b14f87 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Sep 25 2017 08:18:41 +0000
Subject: Enable koji for Python 3


There has been Python 3 koji package already. Enabling koji for Python 3
in freshmaker for both the functional code and tests.

Fix #68

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/freshmaker/handlers/git/dockerfile_change.py b/freshmaker/handlers/git/dockerfile_change.py
index f3a4d4e..7b572f4 100644
--- a/freshmaker/handlers/git/dockerfile_change.py
+++ b/freshmaker/handlers/git/dockerfile_change.py
@@ -21,6 +21,8 @@
 #
 # Written by Chenxiong Qi <cqi@redhat.com>
 
+import koji
+
 from freshmaker import log, conf
 from freshmaker.types import ArtifactType
 from freshmaker.handlers import ContainerBuildHandler
@@ -35,8 +37,6 @@ class GitDockerfileChangeHandler(ContainerBuildHandler):
 
     def handle(self, event):
         """Rebuild docker image"""
-        import koji
-
         log.info('Start to rebuild docker image %s.', event.container)
 
         if not self.allow_build(ArtifactType.IMAGE, name=event.container, branch=event.branch):
diff --git a/freshmaker/kojiservice.py b/freshmaker/kojiservice.py
index e1cc987..34a39c9 100644
--- a/freshmaker/kojiservice.py
+++ b/freshmaker/kojiservice.py
@@ -21,6 +21,8 @@
 #
 # Written by Chenxiong Qi <cqi@redhat.com>
 
+import koji
+
 import contextlib
 from freshmaker import log
 
@@ -36,8 +38,6 @@ class KojiService(object):
     """
 
     def __init__(self, profile=None, logger=None):
-        import koji
-
         self._config = koji.read_config(profile or 'koji')
         self._logger = logger
 
@@ -55,7 +55,6 @@ class KojiService(object):
 
     @property
     def session(self):
-        import koji
         if not hasattr(self, '_session'):
             self._session = koji.ClientSession(self.config['server'],
                                                {'krb_rdns': self.config['krb_rdns']})
diff --git a/tests/test_bodhi_update_complete_stable_handler.py b/tests/test_bodhi_update_complete_stable_handler.py
index 18080c4..63c617a 100644
--- a/tests/test_bodhi_update_complete_stable_handler.py
+++ b/tests/test_bodhi_update_complete_stable_handler.py
@@ -22,8 +22,6 @@
 
 import mock
 import os
-import pytest
-import six
 import sys
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))  # noqa
@@ -90,7 +88,6 @@ def mock_get_release_component_by_id(id):
     return mock_release_components[id]
 
 
-@pytest.mark.skipif(six.PY3, reason='koji does not work in Python 3')
 class BodhiUpdateCompleteStableHandlerTest(helpers.FreshmakerTestCase):
     def setUp(self):
         db.session.remove()
@@ -277,5 +274,5 @@ class BodhiUpdateCompleteStableHandlerTest(helpers.FreshmakerTestCase):
 
         self.assertEqual(5, len(rpms))
 
-        rpm = filter(lambda item: item['id'] == 9515681, rpms)
+        rpm = list(filter(lambda item: item['id'] == 9515681, rpms))
         self.assertEqual(1, len(rpm))
diff --git a/tests/test_errata_advisory_state_changed.py b/tests/test_errata_advisory_state_changed.py
index 10f656b..da1608d 100644
--- a/tests/test_errata_advisory_state_changed.py
+++ b/tests/test_errata_advisory_state_changed.py
@@ -21,8 +21,6 @@
 #
 # Written by Chenxiong Qi <cqi@redhat.com>
 
-import six
-import pytest
 import unittest
 import json
 
@@ -36,7 +34,6 @@ from freshmaker.models import Event, ArtifactBuild
 from freshmaker.types import ArtifactBuildState, ArtifactType
 
 
-@pytest.mark.skipif(six.PY3, reason='koji does not work in Python 3')
 class TestFindBuildSrpmName(unittest.TestCase):
     """Test ErrataAdvisoryRPMsSignedHandler._find_build_srpm_name"""
 
diff --git a/tests/test_git_dockerfile_change_handler.py b/tests/test_git_dockerfile_change_handler.py
index cc755f3..15583a2 100644
--- a/tests/test_git_dockerfile_change_handler.py
+++ b/tests/test_git_dockerfile_change_handler.py
@@ -23,8 +23,6 @@
 import unittest
 
 import fedmsg.config
-import pytest
-import six
 
 from mock import patch
 from mock import MagicMock
@@ -60,7 +58,6 @@ class BaseTestCase(unittest.TestCase):
         consumer.consume(msg)
 
 
-@pytest.mark.skipif(six.PY3, reason='koji does not work in Python 3')
 class GitDockerfileChangeHandlerTest(BaseTestCase):
 
     @patch('koji.read_config')