[ovs-dev] [PATCH 6/6] xenserver: Remove deprecated print statement.
Joe Stringer
joe at ovn.org
Tue May 24 01:20:31 UTC 2016
PEP 3105 removed the print statement in favour of a print function.
Replace usage of the old statement with equivalent functionality that
works in both python2.7 and python3.
Signed-off-by: Joe Stringer <joe at ovn.org>
---
xenserver/opt_xensource_libexec_InterfaceReconfigure.py | 3 ++-
xenserver/opt_xensource_libexec_interface-reconfigure | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
index 196c6863af8f..74b784d34165 100644
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
@@ -44,7 +44,8 @@ def log(s):
if get_log_destination() == 'syslog':
syslog.syslog(s)
else:
- print >>sys.stderr, s
+ sys.stderr.write(s + '\n')
+ sys.stderr.flush()
#
# Exceptions.
diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 7bb456b3bc0a..ea4a7421facf 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -629,7 +629,7 @@ def main(argv=None):
elif o == "--no-syslog":
set_log_destination("stderr")
elif o == "-h" or o == "--help":
- print __doc__ % {'command-name': os.path.basename(argv[0])}
+ print(__doc__ % {'command-name': os.path.basename(argv[0])})
return 0
if get_log_destination() == "syslog":
@@ -714,8 +714,9 @@ def main(argv=None):
db().save(dbcache_file)
except Usage as err:
- print >>sys.stderr, err.msg
- print >>sys.stderr, "For help use --help."
+ sys.stderr.write(err.msg + "\n")
+ sys.stderr.write("For help use --help.\n")
+ sys.stderr.flush()
return 2
except Error as err:
log(err.msg)
--
2.8.2
More information about the dev
mailing list