particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

python-modernize -f libmodernize.fixes.fix_imports_six

Browse source
This commit is contained in:
Tomas Kopecek 2018-06-28 16:58:29 +02:00 • committed by Mike McLean
parent f03646bab5
commit be535c2854
21 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vm/kojikamid.py
View file

@ -28,13 +28,13 @@
from __future__ import absolute_import
from optparse import OptionParser
from ConfigParser import ConfigParser
from six.moves.configparser import ConfigParser
import os
import subprocess
import sys
import tempfile
import time
import xmlrpclib
import six.moves.xmlrpc_client
import base64
import hashlib
import logging
@ -588,13 +588,13 @@ def get_mgmt_server():
macaddr, gateway = find_net_info()
logger.debug('found MAC address %s, connecting to %s:%s',
macaddr, gateway, MANAGER_PORT)
server = xmlrpclib.ServerProxy('http://%s:%s/' %
server = six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' %
(gateway, MANAGER_PORT), allow_none=True)
# we would set a timeout on the socket here, but that is apparently not
# supported by python/cygwin/Windows
task_port = server.getPort(macaddr)
logger.debug('found task-specific port %s', task_port)
return xmlrpclib.ServerProxy('http://%s:%s/' % (gateway, task_port), allow_none=True)
return six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' % (gateway, task_port), allow_none=True)
def get_options():
"""handle usage and parse options"""

34
vm/kojivmd
View file

@ -29,7 +29,7 @@ from koji.tasks import RestartTask, RestartVerifyTask
import sys
import logging
import os
import xmlrpclib
import six.moves.xmlrpc_client
import signal
import time
import subprocess
@ -37,13 +37,13 @@ import libvirt
import libxml2
import random
import socket
import SimpleXMLRPCServer
import six.moves.xmlrpc_server
import threading
import base64
import pwd
import requests
import fnmatch
from ConfigParser import ConfigParser
from six.moves.configparser import ConfigParser
from contextlib import closing
from optparse import OptionParser
try:
@ -246,14 +246,14 @@ def main(options, session):
# Tasks for handling VM lifecycle
####################
class DaemonXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):
allow_reuse_address = True
def __init__(self, addr, port):
if sys.version_info[:2] <= (2, 4):
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False)
six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False)
else:
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False,
six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False,
allow_none=True)
self.logger = logging.getLogger('koji.vm.DaemonXMLRPCServer')
self.socket.settimeout(5)
@ -261,7 +261,7 @@ class DaemonXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
def server_close(self):
self.active = False
SimpleXMLRPCServer.SimpleXMLRPCServer.server_close(self)
six.moves.xmlrpc_server.SimpleXMLRPCServer.server_close(self)
def handle_while_active(self):
while self.active:
@ -282,20 +282,20 @@ class DaemonXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
# Copy and paste from SimpleXMLRPCServer, with the addition of passing
# allow_none=True to xmlrpclib.dumps()
def _marshaled_dispatch(self, data, dispatch_method = None):
params, method = xmlrpclib.loads(data)
params, method = six.moves.xmlrpc_client.loads(data)
try:
if dispatch_method is not None:
response = dispatch_method(method, params)
else:
response = self._dispatch(method, params)
response = (response,)
response = xmlrpclib.dumps(response, methodresponse=1, allow_none=True)
except xmlrpclib.Fault, fault:
response = xmlrpclib.dumps(fault)
response = six.moves.xmlrpc_client.dumps(response, methodresponse=1, allow_none=True)
except six.moves.xmlrpc_client.Fault, fault:
response = six.moves.xmlrpc_client.dumps(fault)
except:
# report exception back to server
response = xmlrpclib.dumps(
xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))
response = six.moves.xmlrpc_client.dumps(
six.moves.xmlrpc_client.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))
)
return response
@ -417,7 +417,7 @@ class VMExecTask(BaseTaskHandler):
def __init__(self, *args, **kw):
super(VMExecTask, self).__init__(*args, **kw)
self.task_manager = xmlrpclib.ServerProxy('http://%s:%s/' % (self.options.privaddr, self.options.portbase),
self.task_manager = six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' % (self.options.privaddr, self.options.portbase),
allow_none=True)
self.port = None
self.server = None
@ -1090,7 +1090,7 @@ if __name__ == "__main__":
options.serverca)
except koji.AuthError, e:
quit("Error: Unable to log in: %s" % e)
except xmlrpclib.ProtocolError:
except six.moves.xmlrpc_client.ProtocolError:
quit("Error: Unable to connect to server %s" % (options.server))
elif options.user:
try:
@ -1098,7 +1098,7 @@ if __name__ == "__main__":
session.login()
except koji.AuthError:
quit("Error: Unable to log in. Bad credentials?")
except xmlrpclib.ProtocolError:
except six.moves.xmlrpc_client.ProtocolError:
quit("Error: Unable to connect to server %s" % (options.server))
elif krbV:
krb_principal = options.krb_principal
@ -1124,7 +1124,7 @@ if __name__ == "__main__":
#make sure it works
try:
ret = session.echo("OK")
except xmlrpclib.ProtocolError:
except six.moves.xmlrpc_client.ProtocolError:
quit("Error: Unable to connect to server %s" % (options.server))
if ret != ["OK"]:
quit("Error: incorrect server response: %r" % (ret))