aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2018-06-18 19:51:30 -0300
committerEduardo Habkost <ehabkost@redhat.com>2018-10-03 23:08:51 -0300
commitae68fdaba9d93d8fd14ef1a1bb2e25cc250d015d (patch)
treeeade02e033e3ac63629a233ee4eb5bb7b69c42a5 /tests/docker
parent8d0ea57ad43b62ddf0838244d3f5b8390928dfc2 (diff)
Revert "docker.py: Python 2.6 argparse compatibility"
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>
Diffstat (limited to 'tests/docker')
-rwxr-xr-xtests/docker/docker.py4
1 files changed, 1 insertions, 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