Permalink
Browse files

rm 0.6 deprecation for takebuf

  • Loading branch information...
1 parent 58fe760 commit 841ad9d80cc2ecbbb701c697998266bb9c991e8c @stevengj stevengj committed Dec 29, 2016
Showing with 4 additions and 4 deletions.
  1. +1 −1 REQUIRE
  2. +1 −1 src/execute_request.jl
  3. +2 −2 src/stdio.jl
View
@@ -2,5 +2,5 @@ julia 0.4
Nettle 0.2
JSON 0.5
ZMQ 0.3.3
-Compat 0.7.20
+Compat 0.9.5
Conda 0.1.5
@@ -34,7 +34,7 @@ if VERSION >= v"0.5.0-dev+4305" # JuliaLang/julia#16354
show(IOContext(b64, limit=true), mime, x)
close(b64)
end
- return takebuf_string(buf)
+ return Compat.UTF8String(take!(buf))
end
else
limitstringmime(mime::MIME, x) = stringmime(mime, x)
View
@@ -108,7 +108,7 @@ end
function send_stream(name::AbstractString)
buf = bufs[name]
if buf.size > 0
- d = takebuf_array(buf)
+ d = take!(buf)
n = num_utf8_trailing(d)
dextra = d[end-(n-1):end]
resize!(d, length(d) - n)
@@ -125,7 +125,7 @@ function send_stream(name::AbstractString)
write(b64, dextra)
close(b64)
print(sbuf, '\n')
- s = takebuf_string(sbuf)
+ s = Compat.UTF8String(take!(sbuf))
end
send_ipython(publish[],
msg_pub(execute_msg, "stream",

0 comments on commit 841ad9d

Please sign in to comment.