Minor changes towards Python 3 Compatability

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 \

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)
 

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)
 

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)

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

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

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

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