[v3] Support building with py2 or py3

[Qemu-devel] [PATCH v3 04/13] qapi: adapt to moved location of StringIO module in py3

Posted by Daniel P. Berrange 8 years ago

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 scripts/qapi.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 7ec2e00b2c..eaa63a58be 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -22,6 +22,10 @@ try:
     from collections import OrderedDict
 except:
     from ordereddict import OrderedDict
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 builtin_types = {
     'null':     'QTYPE_QNULL',
@@ -1995,8 +1999,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
         if really:
             return open(name, opt)
         else:
-            import StringIO
-            return StringIO.StringIO()
+            return StringIO()
 
     fdef = maybe_open(do_c, c_file, 'w')
     fdecl = maybe_open(do_h, h_file, 'w')
-- 
2.14.3

Re: [Qemu-devel] [PATCH v3 04/13] qapi: adapt to moved location of StringIO module in py3

Posted by Philippe Mathieu-Daudé 8 years ago

On 01/15/2018 07:26 AM, Daniel P. Berrange wrote:
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  scripts/qapi.py | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/qapi.py b/scripts/qapi.py
> index 7ec2e00b2c..eaa63a58be 100644
> --- a/scripts/qapi.py
> +++ b/scripts/qapi.py
> @@ -22,6 +22,10 @@ try:
>      from collections import OrderedDict
>  except:
>      from ordereddict import OrderedDict
> +try:
> +    from StringIO import StringIO
> +except ImportError:
> +    from io import StringIO
>  
>  builtin_types = {
>      'null':     'QTYPE_QNULL',
> @@ -1995,8 +1999,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
>          if really:
>              return open(name, opt)
>          else:
> -            import StringIO
> -            return StringIO.StringIO()
> +            return StringIO()
>  
>      fdef = maybe_open(do_c, c_file, 'w')
>      fdecl = maybe_open(do_h, h_file, 'w')
>