replace Base.Base64 with stdlib Base64 module

JuliaLang · Oct 27, 2017 · 205ea95 · 205ea95
1 parent dcbc889
commit 205ea95
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 375 deletions.
diff --git a/base/base64.jl b/base/base64.jl
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -1353,6 +1353,11 @@ export conv, conv2, deconv, filt, filt!, xcorr
 
 @deprecate_binding Mmap nothing true ", run `using Mmap` instead"
 
+@deprecate_moved base64encode "Base64" true true
+@deprecate_moved base64decode "Base64" true true
+@deprecate_moved Base64EncodePipe "Base64" true true
+@deprecate_moved Base64DecodePipe "Base64" true true
+
 # PR #21709
 @deprecate cov(x::AbstractVector, corrected::Bool) cov(x, corrected=corrected)
 @deprecate cov(x::AbstractMatrix, vardim::Int, corrected::Bool) cov(x, vardim, corrected=corrected)

diff --git a/base/exports.jl b/base/exports.jl
@@ -716,10 +716,6 @@ export
 # strings and text output
     ascii,
     base,
-    base64encode,
-    base64decode,
-    Base64EncodePipe,
-    Base64DecodePipe,
     startswith,
     bin,
     bitstring,

diff --git a/base/multimedia.jl b/base/multimedia.jl
@@ -122,8 +122,8 @@ that binary data is base64-encoded as an ASCII string.
 """
 stringmime(m::MIME, x) = istextmime(m) ? reprmime(m, x) : _binstringmime(m, x)
 
-_binstringmime(m::MIME, x) = base64encode(verbose_show, m, x)
-_binstringmime(m::MIME, x::Vector{UInt8}) = base64encode(write, x)
+_binstringmime(m::MIME, x) = Base64.base64encode(verbose_show, m, x)
+_binstringmime(m::MIME, x::Vector{UInt8}) = Base64.base64encode(write, x)
 
 """
     istextmime(m::MIME)

diff --git a/base/stream.jl b/base/stream.jl
@@ -16,8 +16,6 @@ abstract type LibuvStream <: IO end
 # .  +- Pipe
 # .  +- Process (not exported)
 # .  +- ProcessChain (not exported)
-# +- Base64DecodePipe
-# +- Base64EncodePipe
 # +- BufferStream
 # +- DevNullStream (not exported)
 # +- Filesystem.File