Merge pull request #9870 from bcoca/jsonfile_fixes

cache json fixes

lib/ansible/cache/jsonfile.py

@@ -17,14 +17,12 @@
 
 import os
 import time
-import json
 import errno
 
 from ansible import constants as C
 from ansible import utils
 from ansible.cache.base import BaseCacheModule
 
-
 class CacheModule(BaseCacheModule):
     """
     A caching module backed by json files.
@@ -70,12 +68,11 @@ class CacheModule(BaseCacheModule):
 
         cachefile = "%s/%s" % (self._cache_dir, key)
         try:
-            #TODO: check if valid keys can have invalid FS chars, base32?
             f = open(cachefile, 'w')
         except (OSError,IOError), e:
             utils.warning("error while trying to read %s : %s" % (cachefile, str(e)))
         else:
-            json.dump(value, f, ensure_ascii=False)
+            f.write(utils.jsonify(value))
         finally:
             f.close()
 

lib/ansible/cache/redis.py

@@ -20,9 +20,9 @@ import collections
 # FIXME: can we store these as something else before we ship it?
 import sys
 import time
-import json
 
 from ansible import constants as C
+from ansible.utils import jsonify
 from ansible.cache.base import BaseCacheModule
 
 try:
@@ -65,7 +65,7 @@ class CacheModule(BaseCacheModule):
         return json.loads(value)
 
     def set(self, key, value):
-        value2 = json.dumps(value)
+        value2 = jsonify(value)
         if self._timeout > 0: # a timeout of 0 is handled as meaning 'never expire'
             self._cache.setex(self._make_key(key), int(self._timeout), value2)
         else: