yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-26 21:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: convert to use python print function instead of statement

Browse source 
Python 3 no longer supports the bare "print" statement, it must be
called as a normal function with round brackets. It is possible to
opt-in to this new syntax with Python 2.6 onwards by importing the
"print_function" from the "__future__" module, making it easy to
support Python 2 and 3 in parallel.

Backports commit ef9d9108917d6d5f903bca31602827e512a51c50 from qemu
This commit is contained in:
Daniel P. Berrange 2018-03-06 11:26:57 -05:00 committed by Lioncash
parent db311b6802
commit 57c29397c1
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu/scripts/qapi.py
View file

@ -11,6 +11,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. # This work is licensed under the terms of the GNU GPL, version 2.
# See the COPYING file in the top-level directory. # See the COPYING file in the top-level directory.
from __future__ import print_function
import errno import errno
import getopt import getopt
import os import os
@ -1474,7 +1475,7 @@ class QAPISchema(object):
self._def_exprs() self._def_exprs()
self.check() self.check()
except QAPIError as err: except QAPIError as err:
print >>sys.stderr, err print(err, file=sys.stderr)
exit(1) exit(1)
def _def_entity(self, ent): def _def_entity(self, ent):
@ -1933,7 +1934,7 @@ def parse_command_line(extra_options='', extra_long_options=[]):
['source', 'header', 'prefix=', ['source', 'header', 'prefix=',
'output-dir='] + extra_long_options) 'output-dir='] + extra_long_options)
except getopt.GetoptError as err: except getopt.GetoptError as err:
print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err)) print("%s: %s" % (sys.argv[0], str(err)), file=sys.stderr)
sys.exit(1) sys.exit(1)
output_dir = '' output_dir = ''
@ -1947,9 +1948,8 @@ def parse_command_line(extra_options='', extra_long_options=[]):
if o in ('-p', '--prefix'): if o in ('-p', '--prefix'):
match = re.match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', a) match = re.match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', a)
if match.end() != len(a): if match.end() != len(a):
print >>sys.stderr, \ print("%s: 'funny character '%s' in argument of --prefix" \
"%s: 'funny character '%s' in argument of --prefix" \ % (sys.argv[0], a[match.end()]), file=sys.stderr)
% (sys.argv[0], a[match.end()])
sys.exit(1) sys.exit(1)
prefix = a prefix = a
elif o in ('-o', '--output-dir'): elif o in ('-o', '--output-dir'):
@ -1966,7 +1966,7 @@ def parse_command_line(extra_options='', extra_long_options=[]):
do_h = True do_h = True
if len(args) != 1: if len(args) != 1:
print >>sys.stderr, "%s: need exactly one argument" % sys.argv[0] print("%s: need exactly one argument" % sys.argv[0], file=sys.stderr)
sys.exit(1) sys.exit(1)
fname = args[0] fname = args[0]