Skip to content

Commit

Permalink
python: futurize -f libfuturize.fixes.fix_absolute_import
Browse files Browse the repository at this point in the history
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 <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-3-ehabkost@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  • Loading branch information
ehabkost committed Jun 8, 2018
1 parent f03868b commit 068cf7a
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 10 deletions.
3 changes: 2 additions & 1 deletion scripts/qmp/qemu-ga-client
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qmp
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qmp-shell
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qom-fuse
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qom-get
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qom-list
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qom-set
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/qmp/qom-tree
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/image-fuzzer/qcow2/__init__.py
@@ -1 +1,2 @@
from layout import create_image
from __future__ import absolute_import
from .layout import create_image
3 changes: 2 additions & 1 deletion tests/image-fuzzer/qcow2/layout.py
Expand Up @@ -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
Expand Down

0 comments on commit 068cf7a

Please sign in to comment.