Merge pull request #7 from queryverse/fix-iteratorsize

Fix iteratorsize
queryverse · Feb 9, 2019 · 73f7e48 · 73f7e48
2 parents 3a4ab5a + e7f7d5f
commit 73f7e48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# TableShowUtils.jl v0.2.2 Release Notes
+* Fix how IteratorSize is handled
+
 # TableShowUtils.jl v0.2.1 Release Notes
 * Fix a remaining julia deprecation bug
 

diff --git a/src/TableShowUtils.jl b/src/TableShowUtils.jl
@@ -9,7 +9,7 @@ function printtable(io::IO, source, typename::AbstractString; force_unknown_rows
     if force_unknown_rows
         rows = nothing
         data = Iterators.take(source, 10) |> collect
-    elseif Base.IteratorSize(source)==Base.HasLength()
+    elseif Base.IteratorSize(source) isa Union{Base.HasLength, Base.HasShape{1}}
         rows = length(source)
         data = Iterators.take(source, 10) |> collect
     else
@@ -123,7 +123,7 @@ function printHTMLtable(io, source; force_unknown_rows=false)
 
     if force_unknown_rows
         rows = nothing
-    elseif Base.IteratorSize(source)==Base.HasLength()
+    elseif Base.IteratorSize(source) isa Union{Base.HasLength, Base.HasShape{1}}
         rows = length(source)
     else
         count_needed_plus_one =  Iterators.count(i->true, Iterators.take(source, max_elements+1))