Merge pull request #23412 from JuliaLang/cv/env-get

Add method for `get(f::Function, ::EnvHash, key)`
JuliaLang · Aug 25, 2017 · 14d0b4a · 14d0b4a
2 parents 706e720 + 31ec9da
commit 14d0b4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/base/env.jl b/base/env.jl
@@ -77,6 +77,7 @@ similar(::EnvHash) = Dict{String,String}()
 
 getindex(::EnvHash, k::AbstractString) = access_env(k->throw(KeyError(k)), k)
 get(::EnvHash, k::AbstractString, def) = access_env(k->def, k)
+get(f::Callable, ::EnvHash, k::AbstractString) = access_env(k->f(), k)
 in(k::AbstractString, ::KeyIterator{EnvHash}) = _hasenv(k)
 pop!(::EnvHash, k::AbstractString) = (v = ENV[k]; _unsetenv(k); v)
 pop!(::EnvHash, k::AbstractString, def) = haskey(ENV,k) ? pop!(ENV,k) : def

diff --git a/test/env.jl b/test/env.jl
@@ -30,6 +30,7 @@ key = randstring(25)
 @test !haskey(ENV,key)
 @test_throws KeyError ENV[key]
 @test get(ENV,key,"default") == "default"
+@test get(() -> "default", ENV, key) == "default"
 
 # Test for #17956
 @test length(ENV) > 1