X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1667f9860de21d29bbe32bb827db29eca62d9aeb..9e3fd2fa437e2f3dab220a96fbe22ec5b250421d:/sdk/python/arvados/cache.py diff --git a/sdk/python/arvados/cache.py b/sdk/python/arvados/cache.py index 08c19e4aa7..f59d92f5d9 100644 --- a/sdk/python/arvados/cache.py +++ b/sdk/python/arvados/cache.py @@ -1,5 +1,6 @@ +from builtins import object import errno -import md5 +import hashlib import os import tempfile import time @@ -32,14 +33,14 @@ class SafeHTTPCache(object): return self._dir def _filename(self, url): - return os.path.join(self._dir, md5.new(url).hexdigest()+'.tmp') + return os.path.join(self._dir, hashlib.md5(url.encode('utf-8')).hexdigest()+'.tmp') def get(self, url): filename = self._filename(url) try: with open(filename, 'rb') as f: return f.read() - except IOError, OSError: + except IOError as OSError: return None def set(self, url, content): @@ -49,7 +50,7 @@ class SafeHTTPCache(object): return None try: try: - f = os.fdopen(fd, 'w') + f = os.fdopen(fd, 'wb') except: os.close(fd) raise