From patchwork Fri Jun 24 21:15:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 640425 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 3rbrht4Plzz9t0P for ; Sat, 25 Jun 2016 07:15:42 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id D6E8910B76; Fri, 24 Jun 2016 14:15:41 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 730C610AF7 for ; Fri, 24 Jun 2016 14:15:40 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 006561621EB for ; Fri, 24 Jun 2016 15:15:40 -0600 (MDT) X-ASG-Debug-ID: 1466802938-0b32375aee2b2230001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar6.cudamail.com with ESMTP id SgyMbjV8NYeJ73to (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 24 Jun 2016 15:15:38 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx3-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 24 Jun 2016 21:15:38 -0000 Received-SPF: pass (mx3-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.194 X-Barracuda-RBL-IP: 217.70.183.194 Received: from mfilter36-d.gandi.net (mfilter36-d.gandi.net [217.70.178.167]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id D2EB2C5A50; Fri, 24 Jun 2016 23:15:36 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter36-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter36-d.gandi.net (mfilter36-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id sAHxBH1JszQc; Fri, 24 Jun 2016 23:15:35 +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 relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 8AB7EC5A55; Fri, 24 Jun 2016 23:15:34 +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-623044822 X-CudaMail-DTE: 062416 X-CudaMail-Originating-IP: 217.70.183.194 Date: Fri, 24 Jun 2016 14:15:21 -0700 X-ASG-Orig-Subj: [##CM-V1-623044822##][PATCH] ovs-bugtool: Port to python3. Message-Id: <1466802921-8656-1-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.8.2 X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1466802938 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] ovs-bugtool: Port to python3. 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" Fix python2-specific code in ovs-bugtool: * python2 long() is the same as python2 int() and python3 int(). Convert the long() to int(). * raw_input() was renamed to input(). Use python-six's input() on python2. * Drop lambda tuple unpacking, we can go back to regular lambda syntax. * file() can be replaced with open(). Signed-off-by: Joe Stringer Acked-by: Ben Pfaff --- utilities/bugtool/ovs-bugtool.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index cc18285f5759..9e85bc769302 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -34,6 +34,7 @@ # from __future__ import print_function +from six.moves import input import getopt import re @@ -893,10 +894,10 @@ def load_plugins(just_capabilities=False, filter=None): [PII_NO, PII_YES, PII_MAYBE, PII_IF_CUSTOMIZED]: pii = xmldoc.documentElement.getAttribute("pii") if xmldoc.documentElement.getAttribute("min_size") != '': - min_size = long( + min_size = int( xmldoc.documentElement.getAttribute("min_size")) if xmldoc.documentElement.getAttribute("max_size") != '': - max_size = long( + max_size = int( xmldoc.documentElement.getAttribute("max_size")) if xmldoc.documentElement.getAttribute("min_time") != '': min_time = int(xmldoc.documentElement.getAttribute("min_time")) @@ -998,7 +999,7 @@ def make_tar(subdir, suffix, output_fd, output_file): s = os.stat(v['filename']) ti.mtime = s.st_mtime ti.size = s.st_size - tf.addfile(ti, file(v['filename'])) + tf.addfile(ti, open(v['filename'])) except: pass finally: @@ -1059,7 +1060,7 @@ def make_inventory(inventory, subdir): s.setAttribute('uptime', commands.getoutput(UPTIME)) document.getElementsByTagName(INVENTORY_XML_ROOT)[0].appendChild(s) - map(lambda (k, v): inventory_entry(document, subdir, k, v), + map(lambda k_v: inventory_entry(document, subdir, k_v[0], k_v[1]), inventory.items()) return document.toprettyxml() @@ -1176,7 +1177,7 @@ def prettyDict(d): def yes(prompt): - yn = raw_input(prompt) + yn = input(prompt) return len(yn) == 0 or yn.lower()[0] == 'y'