Change in vdsm[master]: use function-like print in more places
danken at redhat.com
danken at redhat.com
Fri Feb 20 12:39:54 UTC 2015
Dan Kenigsberg has uploaded a new change for review.
Change subject: use function-like print in more places
......................................................................
use function-like print in more places
another tiny step for python3 support
Change-Id: I75222d243f27b557ea4b87522b9cf2113534e376
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/cPopenTests.py
M vdsm/get-conf-item
M vdsm/hooks.py
M vdsm/kaxmlrpclib.py
M vdsm/supervdsmServer
M vdsm/vdsm
M vdsm_hooks/extnet/extnet_vnic.py
M vdsm_hooks/macbind/before_vm_start.py
M vdsm_hooks/macspoof/before_vm_start.py
M vdsm_hooks/macspoof/macspoof_vnic.py
M vdsm_hooks/noipspoof/noipspoof.py
M vdsm_hooks/openstacknet/before_device_create.py
M vdsm_hooks/spiceoptions/before_vm_start.py
13 files changed, 39 insertions(+), 39 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/37997/1
diff --git a/tests/cPopenTests.py b/tests/cPopenTests.py
index e8fd808..35cce7a 100644
--- a/tests/cPopenTests.py
+++ b/tests/cPopenTests.py
@@ -154,19 +154,19 @@
if cmd == "fds":
try:
os.close(int(sys.argv[2]))
- print "False"
+ print("False")
except:
- print "True"
+ print("True")
elif cmd == "nofds":
try:
os.close(int(sys.argv[2]))
- print "True"
+ print("True")
except:
- print "False"
+ print("False")
elif cmd == "env":
try:
- print os.environ.get("TEST", "False")
+ print(os.environ.get("TEST", "False"))
except:
- print "False"
+ print("False")
diff --git a/vdsm/get-conf-item b/vdsm/get-conf-item
index 3f5ffc8..048f843 100755
--- a/vdsm/get-conf-item
+++ b/vdsm/get-conf-item
@@ -13,6 +13,6 @@
(dummy, file, section, item, default) = sys.argv
config.read(file)
try:
- print config.get(section, item)
+ print(config.get(section, item))
except:
- print default
+ print(default)
diff --git a/vdsm/hooks.py b/vdsm/hooks.py
index 5b1b457..fae1a03 100644
--- a/vdsm/hooks.py
+++ b/vdsm/hooks.py
@@ -394,7 +394,7 @@
if __name__ == '__main__':
def usage():
- print 'Usage: %s hook_name' % sys.argv[0]
+ print('Usage: %s hook_name' % sys.argv[0])
sys.exit(1)
if len(sys.argv) >= 2:
diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py
index 238b1b5..dbf3057 100644
--- a/vdsm/kaxmlrpclib.py
+++ b/vdsm/kaxmlrpclib.py
@@ -80,7 +80,7 @@
try:
self.sock = socket.socket(af, socktype, proto)
if self.debuglevel > 0:
- print "connect: (%s, %s)" % (self.host, self.port)
+ print("connect: (%s, %s)" % (self.host, self.port))
oldtimeout = self.sock.gettimeout() # added
self.sock.settimeout(CONNECTTIMEOUT) # added
@@ -88,7 +88,7 @@
self.sock.settimeout(oldtimeout) # added
except socket.error as msg:
if self.debuglevel > 0:
- print 'connect fail:', (self.host, self.port)
+ print('connect fail: (%s, %s)' % (self.host, self.port))
if self.sock:
self.sock.close()
self.sock = None
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 59b29a9..6209da0 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -500,7 +500,7 @@
def _usage():
- print "Usage: supervdsmServer --sockfile=fullPath [--pidfile=fullPath]"
+ print("Usage: supervdsmServer --sockfile=fullPath [--pidfile=fullPath]")
def _parse_args():
diff --git a/vdsm/vdsm b/vdsm/vdsm
index 30ceeff..f270843 100755
--- a/vdsm/vdsm
+++ b/vdsm/vdsm
@@ -53,8 +53,8 @@
def usage():
- print "Usage: vdsm [OPTIONS]"
- print " -h - Display this help message"
+ print("Usage: vdsm [OPTIONS]")
+ print(" -h - Display this help message")
def serve_clients(log):
diff --git a/vdsm_hooks/extnet/extnet_vnic.py b/vdsm_hooks/extnet/extnet_vnic.py
index 3315262..0dd4bb4 100755
--- a/vdsm_hooks/extnet/extnet_vnic.py
+++ b/vdsm_hooks/extnet/extnet_vnic.py
@@ -50,12 +50,12 @@
</interface>
""").getElementsByTagName('interface')[0]
- print "Interface before forcing network: %s" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface before forcing network: %s" %
+ interface.toxml(encoding='UTF-8'))
replaceSource(interface, 'yipee')
- print "Interface after forcing network: %s" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface after forcing network: %s" %
+ interface.toxml(encoding='UTF-8'))
if __name__ == '__main__':
diff --git a/vdsm_hooks/macbind/before_vm_start.py b/vdsm_hooks/macbind/before_vm_start.py
index 9532ecc..e362b75 100644
--- a/vdsm_hooks/macbind/before_vm_start.py
+++ b/vdsm_hooks/macbind/before_vm_start.py
@@ -103,13 +103,13 @@
domxml = xml.dom.minidom.parseString(text)
- print "Interface before forcing device: %s" % \
- domxml.toxml(encoding='UTF-8')
+ print("Interface before forcing device: %s" %
+ domxml.toxml(encoding='UTF-8'))
replaceSourceBridge(domxml, {'00:1a:4a:60:d1:9a': 'br0'}, "bridge")
- print "Interface after forcing device: %s" % \
- domxml.toxml(encoding='UTF-8')
+ print("Interface after forcing device: %s" %
+ domxml.toxml(encoding='UTF-8'))
if __name__ == '__main__':
diff --git a/vdsm_hooks/macspoof/before_vm_start.py b/vdsm_hooks/macspoof/before_vm_start.py
index bd71a0f..100d39a 100755
--- a/vdsm_hooks/macspoof/before_vm_start.py
+++ b/vdsm_hooks/macspoof/before_vm_start.py
@@ -54,12 +54,12 @@
</interface>
""").getElementsByTagName('interface')[0]
- print "Interface before removing filter: %s" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface before removing filter: %s" %
+ interface.toxml(encoding='UTF-8'))
removeMacSpoofingFilter(interface)
- print "Interface after removing filter: %s" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface after removing filter: %s" %
+ interface.toxml(encoding='UTF-8'))
if __name__ == '__main__':
diff --git a/vdsm_hooks/macspoof/macspoof_vnic.py b/vdsm_hooks/macspoof/macspoof_vnic.py
index 1c70e38..24c7482 100755
--- a/vdsm_hooks/macspoof/macspoof_vnic.py
+++ b/vdsm_hooks/macspoof/macspoof_vnic.py
@@ -51,12 +51,12 @@
</interface>
""").getElementsByTagName('interface')[0]
- print "Interface before removing filter: %s" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface before removing filter: %s" %
+ interface.toxml(encoding='UTF-8'))
removeMacSpoofingFilter(interface)
- print "Interface after removing filter: %s" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface after removing filter: %s" %
+ interface.toxml(encoding='UTF-8'))
if __name__ == '__main__':
diff --git a/vdsm_hooks/noipspoof/noipspoof.py b/vdsm_hooks/noipspoof/noipspoof.py
index d31b510..2da7f23 100755
--- a/vdsm_hooks/noipspoof/noipspoof.py
+++ b/vdsm_hooks/noipspoof/noipspoof.py
@@ -69,12 +69,12 @@
</interface>
""").getElementsByTagName('interface')[0]
- print "Original interface: %s\n" % \
- interface.toxml(encoding='UTF-8')
+ print("Original interface: %s\n" %
+ interface.toxml(encoding='UTF-8'))
replaceMacSpoofingFilter(interface, ['192.168.1.1', 'nonsense'])
- print "Interface after replacing filter: %s\n" % \
- interface.toxml(encoding='UTF-8')
+ print("Interface after replacing filter: %s\n" %
+ interface.toxml(encoding='UTF-8'))
if __name__ == '__main__':
diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py
index d326cd5..2e27f8e 100755
--- a/vdsm_hooks/openstacknet/before_device_create.py
+++ b/vdsm_hooks/openstacknet/before_device_create.py
@@ -155,7 +155,7 @@
pluginType,
'test_port_id',
withSecurityGroups)
- print domxml.toxml(encoding='utf-8')
+ print(domxml.toxml(encoding='utf-8'))
if __name__ == '__main__':
diff --git a/vdsm_hooks/spiceoptions/before_vm_start.py b/vdsm_hooks/spiceoptions/before_vm_start.py
index a164fd7..e4b99a8 100755
--- a/vdsm_hooks/spiceoptions/before_vm_start.py
+++ b/vdsm_hooks/spiceoptions/before_vm_start.py
@@ -100,13 +100,13 @@
xmldom = minidom.parseString(text)
graphics = xmldom.getElementsByTagName('graphics')[0]
- print "\n Graphic device definition before execution \n %s"\
- % graphics.toxml(encoding='UTF-8')
+ print("\n Graphic device definition before execution \n %s"
+ % graphics.toxml(encoding='UTF-8'))
returnEle = createElement(xmldom, 'image', 'compression', 'glz')
if returnEle:
graphics.appendChild(returnEle)
- print "\n Graphic device after setting image element \n %s"\
- % graphics.toxml(encoding='UTF-8')
+ print("\n Graphic device after setting image element \n %s"
+ % graphics.toxml(encoding='UTF-8'))
if __name__ == '__main__':
--
To view, visit http://gerrit.ovirt.org/37997
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75222d243f27b557ea4b87522b9cf2113534e376
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
More information about the vdsm-patches
mailing list