projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18799: Move canonical discovery document to sdk/python
[arvados.git]
/
sdk
/
python
/
arvados
/
cache.py
diff --git
a/sdk/python/arvados/cache.py
b/sdk/python/arvados/cache.py
index ee1c51fdae324c7c7820ce37db86949554a573dc..85f2b89ea2b7368a2fb509120228538b9e9eb109 100644
(file)
--- a/
sdk/python/arvados/cache.py
+++ b/
sdk/python/arvados/cache.py
@@
-1,6
+1,10
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
from builtins import object
import errno
from builtins import object
import errno
-import
md5
+import
hashlib
import os
import tempfile
import time
import os
import tempfile
import time
@@
-33,14
+37,14
@@
class SafeHTTPCache(object):
return self._dir
def _filename(self, url):
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()
def get(self, url):
filename = self._filename(url)
try:
with open(filename, 'rb') as f:
return f.read()
- except
IOError as OSError
:
+ except
(IOError, OSError)
:
return None
def set(self, url, content):
return None
def set(self, url, content):
@@
-50,7
+54,7
@@
class SafeHTTPCache(object):
return None
try:
try:
return None
try:
try:
- f = os.fdopen(fd, 'w')
+ f = os.fdopen(fd, 'w
b
')
except:
os.close(fd)
raise
except:
os.close(fd)
raise