[Qemu-devel] [PATCH 2/3] Revert "docker.py: Python 2.6 argparse compatibility"

Eduardo Habkost posted 3 patches 7 years, 7 months ago
[Qemu-devel] [PATCH 2/3] Revert "docker.py: Python 2.6 argparse compatibility"
Posted by Eduardo Habkost 7 years, 7 months ago
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>
---
 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 306e14cf69..39f4f318f8 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


Re: [Qemu-devel] [PATCH 2/3] Revert "docker.py: Python 2.6 argparse compatibility"
Posted by Daniel P. Berrangé 7 years, 7 months ago
On Mon, Jun 18, 2018 at 07:51:30PM -0300, Eduardo Habkost wrote:
> 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>
> ---
>  tests/docker/docker.py | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|