[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 02/10] python: futurize -f libfuturize.fixes.fix_
From: |
Eduardo Habkost |
Subject: |
[Qemu-block] [PATCH v2 02/10] python: futurize -f libfuturize.fixes.fix_absolute_import |
Date: |
Fri, 8 Jun 2018 09:29:44 -0300 |
Make implicit relative imports explicit and add "from __future__ import
absolute_import" at the top of each relevant module.
This is necessary for Python 3 compatibility.
Done using:
$ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \
sort -u | grep -v README.sh4)
$ futurize -w -f libfuturize.fixes.fix_absolute_import $py
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Moved "from __future__ import" line after copyright header
---
scripts/qmp/qemu-ga-client | 3 ++-
scripts/qmp/qmp | 3 ++-
scripts/qmp/qmp-shell | 3 ++-
scripts/qmp/qom-fuse | 3 ++-
scripts/qmp/qom-get | 3 ++-
scripts/qmp/qom-list | 3 ++-
scripts/qmp/qom-set | 3 ++-
scripts/qmp/qom-tree | 3 ++-
tests/image-fuzzer/qcow2/__init__.py | 3 ++-
tests/image-fuzzer/qcow2/layout.py | 3 ++-
10 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 8510814683..6045fcd3f2 100755
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -37,10 +37,11 @@
#
from __future__ import print_function
+from __future__ import absolute_import
import base64
import random
-import qmp
+from . import qmp
class QemuGuestAgent(qmp.QEMUMonitorProtocol):
diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp
index 16d3bdb6fe..4d2be4e98a 100755
--- a/scripts/qmp/qmp
+++ b/scripts/qmp/qmp
@@ -11,8 +11,9 @@
# See the COPYING file in the top-level directory.
from __future__ import print_function
+from __future__ import absolute_import
import sys, os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
def print_response(rsp, prefix=[]):
if type(rsp) == list:
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index b1cc7e2271..38c99d8f72 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -66,7 +66,8 @@
# sent to QEMU, which is useful for debugging and documentation generation.
from __future__ import print_function
-import qmp
+from __future__ import absolute_import
+from . import qmp
import json
import ast
import readline
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index 5c6754aa63..b75aa72767 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -11,11 +11,12 @@
# the COPYING file in the top-level directory.
##
+from __future__ import absolute_import
import fuse, stat
from fuse import Fuse
import os, posix
from errno import *
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
fuse.fuse_python_api = (0, 2)
diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
index 291c8bfbc2..6313f27e8e 100755
--- a/scripts/qmp/qom-get
+++ b/scripts/qmp/qom-get
@@ -12,9 +12,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list
index cd907bb81f..80b0a3d1be 100755
--- a/scripts/qmp/qom-list
+++ b/scripts/qmp/qom-list
@@ -12,9 +12,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
index fbe4b3e471..cbffb65880 100755
--- a/scripts/qmp/qom-set
+++ b/scripts/qmp/qom-set
@@ -12,9 +12,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree
index 0ffd1ff1de..ad4be233e6 100755
--- a/scripts/qmp/qom-tree
+++ b/scripts/qmp/qom-tree
@@ -14,9 +14,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/tests/image-fuzzer/qcow2/__init__.py
b/tests/image-fuzzer/qcow2/__init__.py
index e2ebe19311..09ef59821b 100644
--- a/tests/image-fuzzer/qcow2/__init__.py
+++ b/tests/image-fuzzer/qcow2/__init__.py
@@ -1 +1,2 @@
-from layout import create_image
+from __future__ import absolute_import
+from .layout import create_image
diff --git a/tests/image-fuzzer/qcow2/layout.py
b/tests/image-fuzzer/qcow2/layout.py
index 63e801f4e8..675877da96 100644
--- a/tests/image-fuzzer/qcow2/layout.py
+++ b/tests/image-fuzzer/qcow2/layout.py
@@ -16,9 +16,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import absolute_import
import random
import struct
-import fuzz
+from . import fuzz
from math import ceil
from os import urandom
from itertools import chain
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-block] [PATCH v2 00/10] python: futurize --stage1 (Python 3 compatibility), Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 03/10] python: futurize -f libfuturize.fixes.fix_next_call, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 01/10] python: futurize -f libfuturize.fixes.fix_print_with_import, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 02/10] python: futurize -f libfuturize.fixes.fix_absolute_import,
Eduardo Habkost <=
- [Qemu-block] [PATCH v2 04/10] python: futurize -f lib2to3.fixes.fix_has_key, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 05/10] python: futurize -f lib2to3.fixes.fix_standarderror, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 06/10] python: futurize -f lib2to3.fixes.fix_reduce, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 07/10] python: futurize -f lib2to3.fixes.fix_tuple_params, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 08/10] python: futurize -f lib2to3.fixes.fix_renames, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 09/10] python: futurize -f lib2to3.fixes.fix_except, Eduardo Habkost, 2018/06/08
- [Qemu-block] [PATCH v2 10/10] python: futurize -f lib2to3.fixes.fix_numliterals, Eduardo Habkost, 2018/06/08
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 00/10] python: futurize --stage1 (Python 3 compatibility), no-reply, 2018/06/08
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 00/10] python: futurize --stage1 (Python 3 compatibility), no-reply, 2018/06/08