Fix _fnames() with Julia 0.5

Anonymous functions have their own names now.
JuliaData · Feb 11, 2016 · 92332ff · 92332ff
1 parent ae2c1b1
commit 92332ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/other/utils.jl b/src/other/utils.jl
@@ -179,11 +179,10 @@ end
 function _fnames{T<:Function}(fs::Vector{T})
     λcounter = 0
     names = map(fs) do f
-        if isempty(f.env) # Anonymous function
+        name = string(f)
+        if name == "(anonymous function)" # Anonymous functions with Julia < 0.5
             λcounter += 1
             name = "λ$(λcounter)"
-        else
-            name = string(f.env.name)
         end
         name
     end

diff --git a/test/utils.jl b/test/utils.jl
@@ -48,5 +48,9 @@ module TestUtils
     @test DataFrames.countna(pdata) == 20
 
     funs = [mean, sum, var, x -> sum(x)]
-    @test DataFrames._fnames(funs) == ["mean", "sum", "var", "λ1"]
+    if string(funs[end]) == "(anonymous function)" # Julia < 0.5
+        @test map(string, funs) == ["mean", "sum", "var", "λ1"]
+    else
+        @test map(string, funs) == ["mean", "sum", "var", string(funs[end])]
+    end
 end