fix some Python 3 values()-is-not-a-list cases

scikit-hep · Dec 7, 2017 · fa7bfa4 · fa7bfa4
1 parent 24664d9
commit fa7bfa4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/uproot/interp/jagged.py b/uproot/interp/jagged.py
@@ -393,7 +393,7 @@ def jaggedarray_len(context, builder, sig, args):
             @numba.njit([sig])
             def _jaggedarray_len(jaggedarray):
                 return len(jaggedarray.stops)
-            cres = _jaggedarray_len.overloads.values()[0]
+            cres, = _jaggedarray_len.overloads.values()
             len_imp = cres.target_context.get_function(cres.entry_point, cres.signature)._imp
             del cres.target_context._defns[cres.entry_point]
             jaggedarray_len.cache[sig.args] = len_imp
@@ -416,7 +416,7 @@ def jaggedarray_getitem(context, builder, sig, args):
             getitem_imp = jaggedarray_getitem.cache[sig.args]
         except KeyError:
             getitem = numba.njit([sig])(_jaggedarray_getitem)
-            cres = getitem.overloads.values()[0]
+            cres, = getitem.overloads.values()
             getitem_imp = cres.target_context.get_function(cres.entry_point, cres.signature)._imp
             del cres.target_context._defns[cres.entry_point]
             jaggedarray_getitem.cache[sig.args] = getitem_imp
@@ -470,7 +470,7 @@ def jaggedarray_getitem_foriter(context, builder, jaggedarraytype, jaggedarray,
             @numba.njit([jaggedarraytype.contents(jaggedarraytype, JaggedArrayIteratorModel.integertype)])
             def _jaggedarray_getitem(a, i):
                 return a.contents[a.starts[i]:a.stops[i]]
-            cres = _jaggedarray_getitem.overloads.values()[0]
+            cres, = _jaggedarray_getitem.overloads.values()
             getitem_imp = cres.target_context.get_function(cres.entry_point, cres.signature)._imp
             del cres.target_context._defns[cres.entry_point]
             jaggedarray_getitem_foriter.cache = getitem_imp

diff --git a/uproot/tree.py b/uproot/tree.py
@@ -1279,7 +1279,7 @@ def _format(self, foldnames, indent="", strip=""):
             name = name[len(strip) + 1:]
 
         if len(name) > 26:
-            out = [indent + name, indent + "{0:26s} {1:26s} {2}".format("", self._streamer.__class__.__name__, interpret(self))]
+            out = [indent + name, indent + "{0:26s} {1:26s} {2}".format("", "(no streamer)" if self._streamer is None else self._streamer.__class__.__name__, interpret(self))]
         else:
             out = [indent + "{0:26s} {1:26s} {2}".format(name, "(no streamer)" if self._streamer is None else self._streamer.__class__.__name__, interpret(self))]
 

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