python3 compatibility

This commit is contained in:
Tomas Kopecek 2017-05-24 14:07:16 +02:00 committed by Mike McLean
parent 5f5e6cdbb6
commit 5f2342de72
2 changed files with 13 additions and 9 deletions

View file

@ -1,13 +1,15 @@
#!/usr/bin/python
from __future__ import absolute_import
from __future__ import print_function
import ast
import cStringIO
import os
import os.path
import pprint
import sys
import xmlrpclib
from urllib import quote
import six.moves.xmlrpc_client
from six.moves import cStringIO
from six.moves.urllib.parse import quote
sys.path.insert(0, os.getcwd())
sys.path.insert(1, os.path.join(os.getcwd(), 'hub'))
@ -56,7 +58,7 @@ def get_request():
else:
args.append(nice_literal(s))
args = koji.encode_args(*args, **kwargs)
request = xmlrpclib.dumps(args, method, allow_none=1)
request = six.moves.xmlrpc_client.dumps(args, method, allow_none=1)
return request
@ -66,7 +68,7 @@ def start_response(status, headers):
def parse_response(data):
p, u = xmlrpclib.getparser()
p, u = six.moves.xmlrpc_client.getparser()
for chunk in data:
p.feed(chunk)
p.close()
@ -91,7 +93,7 @@ def main():
environ['SERVER_NAME'] = 'myserver'
environ['SERVER_PORT'] = '443'
environ['REQUEST_URI'] = get_url(environ)
environ['wsgi.input'] = cStringIO.StringIO(get_request())
environ['wsgi.input'] = cStringIO(get_request())
environ['REQUEST_METHOD'] = 'POST'
environ['CONTENT_TYPE'] = 'text/xml'
set_config(environ)