From patchwork Tue May 24 01:20:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 625461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rDHgN6Cs3z9t5C for ; Tue, 24 May 2016 11:21:36 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 0A17210928; Mon, 23 May 2016 18:21:02 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 0131410913 for ; Mon, 23 May 2016 18:20:59 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 81BF51E04B0 for ; Mon, 23 May 2016 19:20:58 -0600 (MDT) X-ASG-Debug-ID: 1464052858-09eadd02ef5825c0001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar5.cudamail.com with ESMTP id 15LMJHVlInBw5UCD (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 May 2016 19:20:58 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO relay6-d.mail.gandi.net) (217.70.183.198) by mx3-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 24 May 2016 01:20:57 -0000 Received-SPF: pass (mx3-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.198 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.198 X-Barracuda-RBL-IP: 217.70.183.198 Received: from mfilter27-d.gandi.net (mfilter27-d.gandi.net [217.70.178.155]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 98545FB881 for ; Tue, 24 May 2016 03:20:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter27-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter27-d.gandi.net (mfilter27-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Kp4nQtY7OpQS for ; Tue, 24 May 2016 03:20:55 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from archer.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id ACAE6FB88B for ; Tue, 24 May 2016 03:20:54 +0200 (CEST) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V1-522048041 X-CudaMail-DTE: 052316 X-CudaMail-Originating-IP: 217.70.183.198 Date: Mon, 23 May 2016 18:20:31 -0700 X-ASG-Orig-Subj: [##CM-V1-522048041##][PATCH 6/6] xenserver: Remove deprecated print statement. Message-Id: <1464052831-17278-7-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1464052831-17278-1-git-send-email-joe@ovn.org> References: <1464052831-17278-1-git-send-email-joe@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1464052858 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 6/6] xenserver: Remove deprecated print statement. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 --- 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)