[arvados] updated: 2.7.0-6219-g58fe2158d6

git repository hosting git at public.arvados.org
Thu Mar 28 12:18:28 UTC 2024


Summary of changes:
 sdk/python/arvados/safeapi.py          | 4 ++--
 services/fuse/arvados_fuse/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  58fe2158d605b653cd2de61da22bed092dce58b1 (commit)
       via  3e197765c7cfefe556391661ee9a14abeab2dbb6 (commit)
      from  bf4193eeaa390cec08bbb8333a53fbc89edfd7f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 58fe2158d605b653cd2de61da22bed092dce58b1
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Mar 28 08:17:59 2024 -0400

    21541: Fix typo
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 2dfba46473..aeb0ce4ba7 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -626,7 +626,7 @@ class Operations(llfuse.Operations):
         self.write_ops_counter = arvados.keep.Counter()
 
         self.events = None
-l
+
         # We rely on the cyclic garbage collector to deallocate
         # Collection objects from the Python SDK.  A lower GC
         # threshold encourages Python to be more aggressive in

commit 3e197765c7cfefe556391661ee9a14abeab2dbb6
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Mar 27 17:14:28 2024 -0400

    21541: Revert change to safeapi.py
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/python/arvados/safeapi.py b/sdk/python/arvados/safeapi.py
index 7acabd7b58..56b92e8f08 100644
--- a/sdk/python/arvados/safeapi.py
+++ b/sdk/python/arvados/safeapi.py
@@ -68,9 +68,9 @@ class ThreadSafeApiCache(object):
         self.keep = keep.KeepClient(api_client=self, **keep_params)
 
     def localapi(self) -> 'googleapiclient.discovery.Resource':
-        if 'api' in self.local.__dict__:
+        try:
             client = self.local.api
-        else:
+        except AttributeError:
             client = api.api_client(**self._api_kwargs)
             client._http._request_id = lambda: self.request_id or util.new_request_id()
             self.local.api = client

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list