Commit 9955c495 authored by Boris Glimcher's avatar Boris Glimcher Committed by Jim Harris
Browse files

python/rpc: refactor json_load for clarity 



Change-Id: I25604d01ad2a2c5cbc1253112a454fc160494c9b
Signed-off-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26832


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent cd5e1feb

python/spdk/rpc/config.py

+6 −9
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
import json

import os

import sys



from io import IOBase as io

import io



from . import client as rpc_client
@@ -22,14 +21,12 @@ def _json_dump(config, fd, indent): 




def _json_load(j):

    if j == sys.stdin or isinstance(j, io):

        json_conf = json.load(j)

    elif os.path.exists(j):

    if j == sys.stdin or isinstance(j, io.IOBase):

        return json.load(j)

    if os.path.exists(j):

        with open(j, "r") as j:

            json_conf = json.load(j)

    else:

        json_conf = json.loads(j)

    return json_conf

            return json.load(j)

    return json.loads(j)





def save_config(client, fd, indent=2, subsystems=None):