From 1d3fd2af64ef7939b22ae4981eae991154509b77 Mon Sep 17 00:00:00 2001
From: Yash Nanavati <ynanavat@redhat.com>
Date: Mon, 26 Feb 2018 21:51:47 +0000
Subject: [PATCH] Minor changes towards Python 3 Compatability

---
 Vagrantfile                                       | 3 +++
 module_build_service/builder/CoprModuleBuilder.py | 6 +++---
 module_build_service/builder/KojiModuleBuilder.py | 7 +++++--
 module_build_service/builder/MockModuleBuilder.py | 6 +++---
 module_build_service/builder/__init__.py          | 2 +-
 module_build_service/manage.py                    | 1 +
 requirements.txt                                  | 2 +-
 tests/test_builder/test_koji.py                   | 5 ++++-
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 794ff505..d5716db8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,6 +26,9 @@ $script = <<SCRIPT
         python-qpid \
         python-virtualenv \
         python-futures \
+        python3 \
+        python3-devel \
+        python3-docutils \
         redhat-rpm-config \
         redhat-rpm-config \
         rpm-build \
diff --git a/module_build_service/builder/CoprModuleBuilder.py b/module_build_service/builder/CoprModuleBuilder.py
index f19b02f3..bbb6e842 100644
--- a/module_build_service/builder/CoprModuleBuilder.py
+++ b/module_build_service/builder/CoprModuleBuilder.py
@@ -37,9 +37,9 @@ from module_build_service import log
 import module_build_service.scm
 import module_build_service.utils
 
-from base import GenericBuilder
-from utils import execute_cmd
-from KojiModuleBuilder import KojiModuleBuilder
+from module_build_service.builder.base import GenericBuilder
+from module_build_service.builder.utils import execute_cmd
+from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 
 logging.basicConfig(level=logging.DEBUG)
 
diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index 5ef3a26d..7d9fd26e 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -34,8 +34,11 @@ import dogpile.cache
 import random
 import string
 import kobo.rpmlib
-import xmlrpclib
 import threading
+try:
+    import xmlrpclib
+except ImportError:
+    import xmlrpc.client as xmlrpclib
 
 import munch
 from OpenSSL.SSL import SysCallError
@@ -46,7 +49,7 @@ import module_build_service.utils
 from module_build_service.builder.utils import execute_cmd
 from module_build_service.errors import ProgrammingError
 
-from base import GenericBuilder
+from module_build_service.builder.base import GenericBuilder
 
 logging.basicConfig(level=logging.DEBUG)
 
diff --git a/module_build_service/builder/MockModuleBuilder.py b/module_build_service/builder/MockModuleBuilder.py
index 7611f103..0ce30fa0 100644
--- a/module_build_service/builder/MockModuleBuilder.py
+++ b/module_build_service/builder/MockModuleBuilder.py
@@ -38,14 +38,14 @@ import module_build_service.utils
 import module_build_service.scheduler
 import module_build_service.scheduler.consumer
 
-from base import GenericBuilder
-from utils import (
+from module_build_service.builder.base import GenericBuilder
+from module_build_service.builder.utils import (
     create_local_repo_from_koji_tag,
     execute_cmd,
     find_srpm,
     get_koji_config
 )
-from KojiModuleBuilder import KojiModuleBuilder
+from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 from module_build_service.models import ModuleBuild
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/module_build_service/builder/__init__.py b/module_build_service/builder/__init__.py
index b1949170..b9427a21 100644
--- a/module_build_service/builder/__init__.py
+++ b/module_build_service/builder/__init__.py
@@ -1,7 +1,7 @@
 import pkg_resources
 
 from module_build_service import conf
-from base import GenericBuilder
+from module_build_service.builder.base import GenericBuilder
 
 __all__ = [
     GenericBuilder
diff --git a/module_build_service/manage.py b/module_build_service/manage.py
index f2d26918..76027b3a 100755
--- a/module_build_service/manage.py
+++ b/module_build_service/manage.py
@@ -21,6 +21,7 @@
 #
 # Written by Matt Prahl <mprahl@redhat.com> except for the test functions
 
+from __future__ import print_function
 from flask_script import Manager
 from functools import wraps
 import flask_migrate
diff --git a/requirements.txt b/requirements.txt
index 3e1f6510..f6be4715 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ dogpile.cache
 fedmsg
 funcsigs # Python2 only
 futures # Python 2 only
+future
 httplib2
 kerberos
 kobo>=0.5.0
@@ -20,7 +21,6 @@ pdc-client
 psutil
 pyOpenSSL
 python-fedora
-qpid-python
 requests
 requests_kerberos # Client only
 six
diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py
index d0a6cfaf..c6f72bca 100644
--- a/tests/test_builder/test_koji.py
+++ b/tests/test_builder/test_koji.py
@@ -22,7 +22,10 @@
 
 import mock
 import koji
-import xmlrpclib
+try:
+    import xmlrpclib
+except ImportError:
+    import xmlrpc.client as xmlrpclib
 
 import module_build_service.messaging
 import module_build_service.scheduler.handlers.repos