From: Joe Stringer <joe@ovn.org>
Date: Tue, 24 May 2016 01:20:31 +0000 (-0700)
Subject: xenserver: Remove deprecated print statement.
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;ds=sidebyside;h=561258abf8323f294372346287e33d285cf2b8a4;p=cascardo%2Fovs.git

xenserver: Remove deprecated print statement.

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@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
index 196c6863a..74b784d34 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 7bb456b3b..ea4a7421f 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)