File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ const sym2loader = Dict{Symbol,Vector{Symbol}}()
2
2
const sym2saver = Dict {Symbol,Vector{Symbol}} ()
3
3
4
4
function is_installed (pkg:: Symbol )
5
- isdefined (pkg) && isa (Main .( pkg), Module) && return true # is a module defined in Main scope
5
+ isdefined (pkg) && isa (@compat ( getfield (Main, pkg) ), Module) && return true # is a module defined in Main scope
6
6
path = Base. find_in_path (string (pkg)) # hacky way to determine if a Package is installed
7
7
path == nothing && return false
8
8
return isfile (path)
11
11
function checked_import (pkg:: Symbol )
12
12
! is_installed (pkg) && throw (NotInstalledError (pkg, " " ))
13
13
! isdefined (Main, pkg) && eval (Main, Expr (:import , pkg))
14
- return Main .( pkg)
14
+ return @compat ( getfield (Main, pkg) )
15
15
end
16
16
17
17
Original file line number Diff line number Diff line change @@ -426,8 +426,8 @@ function iter_eq(A, B)
426
426
for _= 1 : length (A)
427
427
a= A[i]; b= B[j]
428
428
a == b && (i+= 1 ; j+= 1 ; continue )
429
- a == ' \r ' && (i+= 1 ; continue ) # this seems like the shadiest solution to deal with windows \r\n
430
- b == ' \r ' && (j+= 1 ; continue )
429
+ a == @compat ( UInt32 ( ' \r ' )) && (i+= 1 ; continue ) # this seems like the shadiest solution to deal with windows \r\n
430
+ b == @compat ( UInt32 ( ' \r ' )) && (j+= 1 ; continue )
431
431
return false # now both must be unequal, and no \r windows excemption any more
432
432
end
433
433
true
You can’t perform that action at this time.
0 commit comments