pxcloud/spice-common
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-08-08 22:50:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop using Python six package

Browse Source 
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Acked-by: Frediano Ziglio <freddy77@gmail.com>
This commit is contained in:
Chris Mayo 2022-11-02 19:29:56 +00:00 committed by Frediano Ziglio
parent 91fc091358
commit 29dacb5f53
6 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -3,7 +3,7 @@ image: fedora:latest
before_script:
- >
dnf install git libtool make libasan
python3 python3-six python3-pyparsing glib-networking
python3 python3-pyparsing glib-networking
meson ninja-build gdk-pixbuf2-devel
glib2-devel pixman-devel openssl-devel libjpeg-devel
libcacard-devel cyrus-sasl-devel lz4-devel opus-devel

6
m4/spice-deps.m4
View File

@ -153,14 +153,12 @@ AC_DEFUN([SPICE_CHECK_PYTHON_MODULES], [
if test "x$enable_python_checks" != "xno"; then
AS_IF([test -n "$PYTHON"], # already set required PYTHON version
[AM_PATH_PYTHON
AX_PYTHON_MODULE([six], [1])
AX_PYTHON_MODULE([pyparsing], [1])],
[PYTHON=python3
AX_PYTHON_MODULE([six])
AX_PYTHON_MODULE([pyparsing])
test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING" = "yes"],
test "$HAVE_PYMOD_PYPARSING" = "yes"],
[AM_PATH_PYTHON([3])],
[AC_MSG_ERROR([Python modules six and pyparsing are required])])
[AC_MSG_ERROR([Python module pyparsing is required])])
else
AM_PATH_PYTHON
fi

2
meson.build
View File

@ -130,7 +130,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code
python = py_module.find_installation('python3')
if get_option('python-checks')
foreach module : ['six', 'pyparsing']
foreach module : ['pyparsing']
message('Checking for python module @0@'.format(module))
cmd = run_command(python, '-c', 'import @0@'.format(module), check : false)
if cmd.returncode() != 0

6
python_modules/codegen.py
View File

@ -1,5 +1,4 @@
import six
from io import StringIO
def camel_to_underscores(s, upper = False):
@ -123,10 +122,7 @@ class CodeWriter:
def write(self, s):
# Ensure its a unicode string
if six.PY3:
s = str(s)
else:
s = unicode(s)
s = str(s)
if len(s) == 0:
return

10
python_modules/spice_parser.py
View File

@ -1,11 +1,9 @@
import six
try:
from pyparsing import Literal, CaselessLiteral, Word, OneOrMore, ZeroOrMore, \
Forward, delimitedList, Group, Optional, Combine, alphas, nums, restOfLine, cStyleComment, \
alphanums, ParseException, ParseResults, Keyword, StringEnd, replaceWith
except ImportError:
six.print_("Module pyparsing not found.")
print("Module pyparsing not found.")
exit(1)
@ -149,9 +147,9 @@ def parse(filename):
bnf = SPICE_BNF()
types = bnf.parseFile(filename)
except ParseException as err:
six.print_(err.line, file=sys.stderr)
six.print_(" "*(err.column-1) + "^", file=sys.stderr)
six.print_(err, file=sys.stderr)
print(err.line, file=sys.stderr)
print(" "*(err.column-1) + "^", file=sys.stderr)
print(err, file=sys.stderr)
return None
for t in types:

11
spice_codegen.py
View File

@ -9,7 +9,7 @@ from python_modules import ptypes
from python_modules import codegen
from python_modules import demarshal
from python_modules import marshal
import six
def write_channel_enums(writer, channel, client, describe):
messages = list(filter(lambda m : m.channel == channel, \
@ -113,20 +113,17 @@ def write_content(dest_file, content, keep_identical_file):
f.close()
if content == old_content:
six.print_("No changes to %s" % dest_file)
print("No changes to %s" % dest_file)
return
except IOError:
pass
f = open(dest_file, 'wb')
if six.PY3:
f.write(bytes(content, 'UTF-8'))
else:
f.write(content)
f.write(bytes(content, 'UTF-8'))
f.close()
six.print_("Wrote %s" % dest_file)
print("Wrote %s" % dest_file)
parser = OptionParser(usage="usage: %prog [options] <protocol_file> <destination file>")