ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Restore json import for redis as well. Switch preference to simplejson for speed

Browse source
This commit is contained in:
Toshio Kuratomi 2014-12-23 13:14:14 -08:00
parent ec2fc3adf8
commit 5ed7a55990
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/cache/jsonfile.py vendored
View file

@ -20,9 +20,9 @@ import time
import errno import errno
try: try:
import json
except ImportError:
import simplejson as json import simplejson as json
except ImportError:
import json
from ansible import constants as C from ansible import constants as C
from ansible import utils from ansible import utils

5
lib/ansible/cache/redis.py vendored
View file

@ -21,6 +21,11 @@ import collections
import sys import sys
import time import time
try:
import simplejson as json
except ImportError:
import json
from ansible import constants as C from ansible import constants as C
from ansible.utils import jsonify from ansible.utils import jsonify
from ansible.cache.base import BaseCacheModule from ansible.cache.base import BaseCacheModule

6
lib/ansible/utils/__init__.py
View file

@ -45,7 +45,6 @@ import warnings
import traceback import traceback
import getpass import getpass
import sys import sys
import json
import subprocess import subprocess
import contextlib import contextlib
@ -63,9 +62,10 @@ CODE_REGEX = re.compile(r'(?:{%|%})')
try: try:
import json # simplejson can be much faster if it's available
except ImportError:
import simplejson as json import simplejson as json
except ImportError:
import json
# Note, sha1 is the only hash algorithm compatible with python2.4 and with # Note, sha1 is the only hash algorithm compatible with python2.4 and with
# FIPS-140 mode (as of 11-2014) # FIPS-140 mode (as of 11-2014)