yes, #36 is fixed; new version 2.5.9

Author: jpivarski

uproot/rootio.py

@@ -172,6 +172,7 @@ def read(source, *args, **options):
                 out = ROOTDirectory(mykey.fName, context, keys)
                 out.fVersion, out.fDatimeC, out.fDatimeM, out.fNbytesKeys, out.fNbytesName, out.fSeekDir, out.fSeekParent, out.fSeekKeys = fVersion, fDatimeC, fDatimeM, fNbytesKeys, fNbytesName, fSeekDir, fSeekParent, fSeekKeys
                 out._headerkey = headerkey
+                out.source = source
                 return out
 
             finally:

uproot/source/chunked.py

@@ -41,9 +41,9 @@ def __init__(self, path, chunkbytes, limitbytes):
         self.path = path
         self._chunkbytes = chunkbytes
         if limitbytes is None:
-            self._cache = uproot.cache.memorycache.ThreadSafeDict()
+            self.cache = uproot.cache.memorycache.ThreadSafeDict()
         else:
-            self._cache = uproot.cache.memorycache.ThreadSafeMemoryCache(limitbytes)
+            self.cache = uproot.cache.memorycache.ThreadSafeMemoryCache(limitbytes)
         self._source = None
 
     def parent(self):
@@ -81,10 +81,10 @@ def data(self, start, stop, dtype=None):
 
         for chunkindex in range(chunkstart, chunkstop):
             try:
-                chunk = self._cache[chunkindex]
+                chunk = self.cache[chunkindex]
             except KeyError:
                 self._open()
-                chunk = self._cache[chunkindex] = self._read(chunkindex)
+                chunk = self.cache[chunkindex] = self._read(chunkindex)
 
             cstart = 0
             cstop = self._chunkbytes

uproot/source/file.py

@@ -56,10 +56,10 @@ def threadlocal(self):
         out = FileSource.__new__(self.__class__)
         out.path = self.path
         out._chunkbytes = self._chunkbytes
-        if isinstance(self._cache, (uproot.cache.memorycache.ThreadSafeMemoryCache, uproot.cache.memorycache.ThreadSafeDict)):
-            out._cache = self._cache
+        if isinstance(self.cache, (uproot.cache.memorycache.ThreadSafeMemoryCache, uproot.cache.memorycache.ThreadSafeDict)):
+            out.cache = self.cache
         else:
-            out._cache = {}
+            out.cache = {}
         out._source = None             # local file connections are *not shared* among threads (they're *not* thread-safe)
         return out
 

uproot/source/xrootd.py

@@ -71,10 +71,10 @@ def threadlocal(self):
         out = XRootDSource.__new__(self.__class__)
         out.path = self.path
         out._chunkbytes = self._chunkbytes
-        if isinstance(self._cache, (uproot.cache.memorycache.ThreadSafeMemoryCache, uproot.cache.memorycache.ThreadSafeDict)):
-            out._cache = self._cache
+        if isinstance(self.cache, (uproot.cache.memorycache.ThreadSafeMemoryCache, uproot.cache.memorycache.ThreadSafeDict)):
+            out.cache = self.cache
         else:
-            out._cache = {}
+            out.cache = {}
         out._source = self._source     # XRootD connections are *shared* among threads (I'm assuming they're thread-safe)
         return out
 

uproot/version.py

@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "2.5.8"
+__version__ = "2.5.9"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))