[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibi
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility" |
Date: |
Wed, 3 Oct 2018 23:19:41 -0300 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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
- [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03, Eduardo Habkost, 2018/10/03
- [Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility",
Eduardo Habkost <=
- [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack, Eduardo Habkost, 2018/10/03
- [Qemu-devel] [PULL 4/4] scripts/device-crash-test: Remove entries for serial devices, Eduardo Habkost, 2018/10/03
- [Qemu-devel] [PULL 3/4] Revert "tests: migration/guestperf Python 2.6 argparse compatibility", Eduardo Habkost, 2018/10/03
- Re: [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03, Peter Maydell, 2018/10/05