From e44aef95f8d2cf3a6e047b59cbde2d5472ea2b9e Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 19 Mar 2018 16:53:16 -0700 Subject: [PATCH] scripts/rpc.py: move print_array to rpc.py This isn't needed in client.py. Change-Id: I7034aea06cd59af55a33e91cc4583aca899e7201 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/404431 Reviewed-by: Paul Luse Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System --- scripts/rpc.py | 12 +++++++++++- scripts/rpc/client.py | 9 --------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/rpc.py b/scripts/rpc.py index c8e0da238..6eb3c0101 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1,10 +1,20 @@ #!/usr/bin/env python -from rpc.client import print_dict, print_array +from rpc.client import print_dict import argparse import rpc +try: + from shlex import quote +except ImportError: + from pipes import quote + + +def print_array(a): + print " ".join((quote(v) for v in a)) + + if __name__ == "__main__": parser = argparse.ArgumentParser( description='SPDK RPC command line interface') diff --git a/scripts/rpc/client.py b/scripts/rpc/client.py index b43957204..ad565813a 100755 --- a/scripts/rpc/client.py +++ b/scripts/rpc/client.py @@ -2,20 +2,11 @@ import json import socket import time -try: - from shlex import quote -except ImportError: - from pipes import quote - def print_dict(d): print json.dumps(d, indent=2) -def print_array(a): - print " ".join((quote(v) for v in a)) - - class JSONRPCClient(object): def __init__(self, addr, port=None, verbose=False, timeout=60.0): self.verbose = verbose