back-propagate PR #293 into 3.4.x (making 3.4.20)

scikit-hep · Jun 24, 2019 · 1c27377 · 1c27377
1 parent b5141ea
commit 1c27377
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/uproot/source/file.py b/uproot/source/file.py
@@ -42,6 +42,7 @@ class FileSource(uproot.source.chunked.ChunkedSource):
 
     def __init__(self, path, *args, **kwds):
         self._size = None
+        self._parallel = kwds["parallel"]
         super(FileSource, self).__init__(os.path.expanduser(path), *args, **kwds)
 
     def size(self):
@@ -55,6 +56,7 @@ def threadlocal(self):
         out._chunkbytes = self._chunkbytes
         out.cache = self.cache
         out._source = None             # local file connections are *not shared* among threads (they're *not* thread-safe)
+        out._setup_futures(self._parallel)
         return out
 
     def _open(self):

diff --git a/uproot/version.py b/uproot/version.py
@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "3.4.19"
+__version__ = "3.4.20"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))