Merge branch 'master' into 14716-webdav-cluster-config

[arvados.git] / services / fuse / arvados_fuse / fusedir.py

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 9d53df950b8cd4886398be7134d4207dcb0beef5..328765744128d180ba30854854f71b2340ee1cc0 100644 (file)
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import
 from __future__ import division
 from future.utils import viewitems
+from future.utils import itervalues
 from builtins import dict
 import logging
 import re
@@ -167,7 +168,7 @@ class Directory(FreshBase):
     def in_use(self):
         if super(Directory, self).in_use():
             return True
-        for v in self._entries.values():
+        for v in itervalues(self._entries):
             if v.in_use():
                 return True
         return False
@@ -175,7 +176,7 @@ class Directory(FreshBase):
     def has_ref(self, only_children):
         if super(Directory, self).has_ref(only_children):
             return True
-        for v in self._entries.values():
+        for v in itervalues(self._entries):
             if v.has_ref(False):
                 return True
         return False