modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-24 02:32:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #870 Minor changes towards Python 3 Compatability

Browse Source
This commit is contained in:
Matt Prahl
2018-02-28 14:08:53 +00:00
parent 654820ac31 1d3fd2af64
commit 680da620d7
8 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module_build_service/builder/CoprModuleBuilder.py
View File

@@ -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)

7
module_build_service/builder/KojiModuleBuilder.py
View File

@@ -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)

6
module_build_service/builder/MockModuleBuilder.py
View File

@@ -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)

2
module_build_service/builder/__init__.py
View File

@@ -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

1
module_build_service/manage.py
View File

@@ -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