1. Patchew
  2. QEMU
  3. [PATCH 0/4] qapi: Bye-bye Python 2
  4. View patch

[PATCH 2/4] qapi: Drop conditionals for Python 2

Markus Armbruster posted 4 patches 5 years, 8 months ago
Maintainers: Michael Roth <mdroth@linux.vnet.ibm.com>, Markus Armbruster <armbru@redhat.com>
There is a newer version of this series
[PATCH 2/4] qapi: Drop conditionals for Python 2
Posted by Markus Armbruster 5 years, 8 months ago 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/qapi/common.py         | 6 +-----
 scripts/qapi/gen.py            | 6 +-----
 scripts/qapi/parser.py         | 6 +-----
 tests/qapi-schema/test-qapi.py | 6 +-----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index e00dcafce7..ba35abea47 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -12,7 +12,6 @@
 # See the COPYING file in the top-level directory.
 
 import re
-import string
 
 
 # ENUMName -> ENUM_NAME, EnumName1 -> ENUM_NAME1
@@ -43,10 +42,7 @@ def c_enum_const(type_name, const_name, prefix=None):
     return camel_to_upper(type_name) + '_' + c_name(const_name, False).upper()
 
 
-if hasattr(str, 'maketrans'):
-    c_name_trans = str.maketrans('.-', '__')
-else:
-    c_name_trans = string.maketrans('.-', '__')
+c_name_trans = str.maketrans('.-', '__')
 
 
 # Map @name to a valid C identifier.
diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
index a53a705c73..317cd72601 100644
--- a/scripts/qapi/gen.py
+++ b/scripts/qapi/gen.py
@@ -15,7 +15,6 @@
 import errno
 import os
 import re
-import sys
 from contextlib import contextmanager
 
 from qapi.common import *
@@ -54,10 +53,7 @@ class QAPIGen:
                 if e.errno != errno.EEXIST:
                     raise
         fd = os.open(pathname, os.O_RDWR | os.O_CREAT, 0o666)
-        if sys.version_info[0] >= 3:
-            f = open(fd, 'r+', encoding='utf-8')
-        else:
-            f = os.fdopen(fd, 'r+')
+        f = open(fd, 'r+', encoding='utf-8')
         text = self.get_content()
         oldtext = f.read(len(text) + 1)
         if text != oldtext:
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index 2e3a3c5d76..cf14e5426c 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -16,7 +16,6 @@
 
 import os
 import re
-import sys
 from collections import OrderedDict
 
 from qapi.error import QAPIParseError, QAPISemError
@@ -30,10 +29,7 @@ class QAPISchemaParser:
         previously_included.add(os.path.abspath(fname))
 
         try:
-            if sys.version_info[0] >= 3:
-                fp = open(fname, 'r', encoding='utf-8')
-            else:
-                fp = open(fname, 'r')
+            fp = open(fname, 'r', encoding='utf-8')
             self.src = fp.read()
         except IOError as e:
             raise QAPISemError(incl_info or QAPISourceInfo(None, None, None),
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
index 41232c11a3..bee18ee344 100755
--- a/tests/qapi-schema/test-qapi.py
+++ b/tests/qapi-schema/test-qapi.py
@@ -16,15 +16,11 @@ import argparse
 import difflib
 import os
 import sys
+from io import StringIO
 
 from qapi.error import QAPIError
 from qapi.schema import QAPISchema, QAPISchemaVisitor
 
-if sys.version_info[0] < 3:
-    from cStringIO import StringIO
-else:
-    from io import StringIO
-
 
 class QAPISchemaTestVisitor(QAPISchemaVisitor):
 
-- 
2.21.1
Re: [PATCH 2/4] qapi: Drop conditionals for Python 2
Posted by Philippe Mathieu-Daudé 5 years, 8 months ago 
On 2/27/20 3:45 PM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   scripts/qapi/common.py         | 6 +-----
>   scripts/qapi/gen.py            | 6 +-----
>   scripts/qapi/parser.py         | 6 +-----
>   tests/qapi-schema/test-qapi.py | 6 +-----
>   4 files changed, 4 insertions(+), 20 deletions(-)
> 
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index e00dcafce7..ba35abea47 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -12,7 +12,6 @@
>   # See the COPYING file in the top-level directory.
>   
>   import re
> -import string
>   
>   
>   # ENUMName -> ENUM_NAME, EnumName1 -> ENUM_NAME1
> @@ -43,10 +42,7 @@ def c_enum_const(type_name, const_name, prefix=None):
>       return camel_to_upper(type_name) + '_' + c_name(const_name, False).upper()
>   
>   
> -if hasattr(str, 'maketrans'):
> -    c_name_trans = str.maketrans('.-', '__')
> -else:
> -    c_name_trans = string.maketrans('.-', '__')
> +c_name_trans = str.maketrans('.-', '__')
>   
>   
>   # Map @name to a valid C identifier.
> diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py
> index a53a705c73..317cd72601 100644
> --- a/scripts/qapi/gen.py
> +++ b/scripts/qapi/gen.py
> @@ -15,7 +15,6 @@
>   import errno
>   import os
>   import re
> -import sys
>   from contextlib import contextmanager
>   
>   from qapi.common import *
> @@ -54,10 +53,7 @@ class QAPIGen:
>                   if e.errno != errno.EEXIST:
>                       raise
>           fd = os.open(pathname, os.O_RDWR | os.O_CREAT, 0o666)
> -        if sys.version_info[0] >= 3:
> -            f = open(fd, 'r+', encoding='utf-8')
> -        else:
> -            f = os.fdopen(fd, 'r+')
> +        f = open(fd, 'r+', encoding='utf-8')
>           text = self.get_content()
>           oldtext = f.read(len(text) + 1)
>           if text != oldtext:
> diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
> index 2e3a3c5d76..cf14e5426c 100644
> --- a/scripts/qapi/parser.py
> +++ b/scripts/qapi/parser.py
> @@ -16,7 +16,6 @@
>   
>   import os
>   import re
> -import sys
>   from collections import OrderedDict
>   
>   from qapi.error import QAPIParseError, QAPISemError
> @@ -30,10 +29,7 @@ class QAPISchemaParser:
>           previously_included.add(os.path.abspath(fname))
>   
>           try:
> -            if sys.version_info[0] >= 3:
> -                fp = open(fname, 'r', encoding='utf-8')
> -            else:
> -                fp = open(fname, 'r')
> +            fp = open(fname, 'r', encoding='utf-8')
>               self.src = fp.read()
>           except IOError as e:
>               raise QAPISemError(incl_info or QAPISourceInfo(None, None, None),
> diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
> index 41232c11a3..bee18ee344 100755
> --- a/tests/qapi-schema/test-qapi.py
> +++ b/tests/qapi-schema/test-qapi.py
> @@ -16,15 +16,11 @@ import argparse
>   import difflib
>   import os
>   import sys
> +from io import StringIO
>   
>   from qapi.error import QAPIError
>   from qapi.schema import QAPISchema, QAPISchemaVisitor
>   
> -if sys.version_info[0] < 3:
> -    from cStringIO import StringIO
> -else:
> -    from io import StringIO
> -
>   
>   class QAPISchemaTestVisitor(QAPISchemaVisitor):
>   
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.