restore jcache compression, busted by pull #826

2 files changed, 13 insertions, 4 deletions

diff --git a/tools/cache.py b/tools/cache.py
index 6647219d..a63d7bb3 100644
--- a/tools/cache.py
+++ b/tools/cache.py
@@ -1,4 +1,4 @@
-import os.path, shutil, hashlib, cPickle
+import os.path, shutil, hashlib, cPickle, zlib
 
 import tempfiles
 
@@ -68,7 +68,10 @@ class JCache:
     if not os.path.exists(cachename):
       #if DEBUG: print >> sys.stderr, 'jcache none at all'
       return
-    data = cPickle.Unpickler(open(cachename, 'rb')).load()
+    try:
+      data = cPickle.loads(zlib.decompress(open(cachename).read()))
+    except Exception, e:
+      if DEBUG_CACHE: print >> sys.stderr, 'jcache decompress/unpickle error:', e
     if len(data) != 2:
       #if DEBUG: print >> sys.stderr, 'jcache error in get'
       return
@@ -86,7 +89,13 @@ class JCache:
   # Sets the cached value for a key (from get_key)
   def set(self, shortkey, keys, value):
     cachename = self.get_cachename(shortkey)
-    cPickle.Pickler(open(cachename, 'wb')).dump([keys, value])
+    try:
+      f = open(cachename, 'w')
+      f.write(zlib.compress(cPickle.dumps([keys, value])))
+      f.close()
+    except Exception, e:
+      if DEBUG_CACHE: print >> sys.stderr, 'jcache compress/pickle error:', e
+      return
     #if DEBUG:
     #  for i in range(len(keys)):
     #    open(cachename + '.key' + str(i), 'w').write(keys[i])
diff --git a/tools/shared.py b/tools/shared.py
index 06d530b8..74e4d8f3 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -1,4 +1,4 @@
-import shutil, time, os, sys, json, tempfile, copy, shlex, atexit, subprocess, hashlib, cPickle, zlib, re
+import shutil, time, os, sys, json, tempfile, copy, shlex, atexit, subprocess, hashlib, cPickle, re
 from subprocess import Popen, PIPE, STDOUT
 from tempfile import mkstemp
 import jsrun, cache, tempfiles