X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fcache.py;h=75b22e49699debb81c1686df42833c4302d22cd5;hb=cce1a1e1b857acb64d6b4c2a0b0ce3b8d11d765f;hp=ee4716c6348a5b66eeff8adbd9685ebffa571e98;hpb=b6de9285a970eccb9658a0078c49f76fb11af7cd;p=sfa.git

diff --git a/sfa/util/cache.py b/sfa/util/cache.py
index ee4716c6..75b22e49 100644
--- a/sfa/util/cache.py
+++ b/sfa/util/cache.py
@@ -75,7 +75,7 @@ class Cache:
    
     def add(self, key, value, ttl = DEFAULT_CACHE_TTL):
         with self.lock:
-            if self.cache.has_key(key):
+            if key in self.cache:
                 self.cache[key].set_data(value, ttl=ttl)
             else:
                 self.cache[key] = CacheData(value, ttl)
@@ -108,9 +108,9 @@ class Cache:
         return self.__str()    
 
     def save_to_file(self, filename):
-        f = open(filename, 'w')
+        f = open(filename, 'wb')
         pickle.dump(self.cache, f)
 
     def load_from_file(self, filename):
-        f = open(filename, 'r')
+        f = open(filename, 'rb')
         self.cache = pickle.load(f)