mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

RHEL 7: v2v: -o rhv-upload: Use Python 2 instead of Python 3.

Browse Source 
For RHEL 7.6 LP only, this is a further change required for
Python 2 support.  See also these commits:

"RHEL 7: -o rhv-upload: Use Python 2 instead of Python 3."
+ the preceeding 4 commits to this one.
This commit is contained in:
Richard W.M. Jones
2018-09-26 18:50:11 +01:00
committed by Pino Toscano
parent 69f181715f
commit e1f4850b2b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
v2v/test-v2v-o-rhv-upload-module/ovirtsdk4/__init__.py
View File

@@ -112,10 +112,11 @@ class VmsService(object):
# Create a background thread running a web server which is
# simulating the imageio server.
from http.server import HTTPServer, BaseHTTPRequestHandler
import SimpleHTTPServer
import SocketServer
import threading
class RequestHandler(BaseHTTPRequestHandler):
class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
protocol_version = 'HTTP/1.1'
def do_OPTIONS(self):
@@ -154,11 +155,12 @@ class RequestHandler(BaseHTTPRequestHandler):
server_address = ("", 0)
# XXX This should test HTTPS, not HTTP, because we are testing a
# different path through the main code.
httpd = HTTPServer(server_address, RequestHandler)
httpd = SocketServer.TCPServer(server_address, RequestHandler)
imageio_port = httpd.server_address[1]
def server():
httpd.serve_forever()
thread = threading.Thread(target = server, args = [], daemon = True)
thread = threading.Thread(target = server, args = [])
thread.daemon = True
thread.start()