openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Replace simplejson by built-in json"

Browse Source
This commit is contained in:
Zuul 2022-09-21 07:20:09 +00:00 committed by Gerrit Code Review
commit cab91feacd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -9,7 +9,6 @@ python-ironic-inspector-client>=1.5.0 # Apache-2.0
python-heatclient>=1.10.0 # Apache-2.0
python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0,>=2.3.0 # Apache-2.0
python-openstackclient>=5.2.0 # Apache-2.0
simplejson>=3.5.1 # MIT
osc-lib>=2.3.0 # Apache-2.0
tripleo-common>=16.3.0 # Apache-2.0
cryptography>=2.1 # BSD/Apache-2.0

3
tripleoclient/utils.py
View File

@ -35,7 +35,6 @@ import prettytable
import pwd
import re
import shutil
import simplejson
import socket
import subprocess
import sys
@ -1556,7 +1555,7 @@ def _csv_to_nodes_dict(nodes_csv):
def parse_env_file(env_file, file_type=None):
if file_type == 'json' or env_file.name.endswith('.json'):
nodes_config = simplejson.load(env_file)
nodes_config = json.load(env_file)
elif file_type == 'csv' or env_file.name.endswith('.csv'):
nodes_config = _csv_to_nodes_dict(env_file)
elif env_file.name.endswith('.yaml'):