From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>, Cleber Rosa <crosa@redhat.com>
Subject: [Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility"
Date: Wed, 3 Oct 2018 23:19:41 -0300 [thread overview]
Message-ID: <20181004021943.22724-3-ehabkost@redhat.com> (raw)
In-Reply-To: <20181004021943.22724-1-ehabkost@redhat.com>
This reverts commit c2d3189667409561772e8c1e5615c5166cd8aa2c.
scripts/argparse.py was removed from the tree, so we don't need
this hack anymore.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180618225131.13113-3-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/docker/docker.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index d3006d4dae..44d5f7493b 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -14,14 +14,12 @@
from __future__ import print_function
import os
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__),
- '..', '..', 'scripts'))
-import argparse
import subprocess
import json
import hashlib
import atexit
import uuid
+import argparse
import tempfile
import re
import signal
--
2.18.0.rc1.1.g3f1ff2140
next prev parent reply other threads:[~2018-10-04 2:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack Eduardo Habkost
2018-10-04 2:19 ` Eduardo Habkost [this message]
2018-10-04 2:19 ` [Qemu-devel] [PULL 3/4] Revert "tests: migration/guestperf Python 2.6 argparse compatibility" Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 4/4] scripts/device-crash-test: Remove entries for serial devices Eduardo Habkost
2018-10-05 13:52 ` [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181004021943.22724-3-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=crosa@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).