{"id":808268,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808268/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170831142430.16665-5-berrange@redhat.com>","date":"2017-08-31T14:24:29","name":"[v2,4/5] qapi: adapt to moved location of StringIO module in py3","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3fe48cc2a5e49b13a6159f853f97daaf00fc0d42","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/1.0/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831142430.16665-5-berrange@redhat.com/mbox/","series":[{"id":841,"url":"http://patchwork.ozlabs.org/api/1.0/series/841/?format=json","date":"2017-08-31T14:24:26","name":"qapi: support py2 & py3 in parallel","version":2,"mbox":"http://patchwork.ozlabs.org/series/841/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808268/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjl8s4TkSz9s83\n\tfor ;\n\tFri, 1 Sep 2017 00:28:13 +1000 (AEST)","from localhost ([::1]:56055 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnQS3-0002EL-ND\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 10:28:11 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43542)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnQOq-00081C-1F\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 10:24:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnQOp-0007f1-3a\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 10:24:51 -0400","from mx1.redhat.com ([209.132.183.28]:60454)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnQOo-0007eb-Tc\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 10:24:51 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id E8DAB267F7;\n\tThu, 31 Aug 2017 14:24:49 +0000 (UTC)","from localhost.localdomain.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 987E2B32C3;\n\tThu, 31 Aug 2017 14:24:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E8DAB267F7","From":"\"Daniel P. Berrange\" ","To":"qemu-devel@nongnu.org","Date":"Thu, 31 Aug 2017 15:24:29 +0100","Message-Id":"<20170831142430.16665-5-berrange@redhat.com>","In-Reply-To":"<20170831142430.16665-1-berrange@redhat.com>","References":"<20170831142430.16665-1-berrange@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 31 Aug 2017 14:24:50 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 4/5] qapi: adapt to moved location of\n\tStringIO module in py3","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Markus Armbruster ,\n\tMichael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Daniel P. Berrange \n---\n scripts/qapi.py | 7 +++++--\n 1 file changed, 5 insertions(+), 2 deletions(-)","diff":"diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex 05cb1ee38c..3c06711e2c 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -22,6 +22,10 @@ try:\n from collections import OrderedDict\n except:\n from ordereddict import OrderedDict\n+try:\n+ from StringIO import StringIO\n+except ImportError:\n+ from io import StringIO\n \n builtin_types = {\n 'null': 'QTYPE_QNULL',\n@@ -2000,8 +2004,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,\n if really:\n return open(name, opt)\n else:\n- import StringIO\n- return StringIO.StringIO()\n+ return StringIO()\n \n fdef = maybe_open(do_c, c_file, 'w')\n fdecl = maybe_open(do_h, h_file, 'w')\n","prefixes":["v2","4/5"]}