Merge pull request #549 from timholy/teh/stringify

Eliminate type-piracy in `string`
JuliaWeb · Jun 30, 2020 · 971312f · 971312f
2 parents f3a08d7 + 213dc6c
commit 971312f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/CookieRequest.jl b/src/CookieRequest.jl
@@ -38,7 +38,7 @@ function request(::Type{CookieLayer{Next}},
         end
     end
     if !isempty(cookiestosend)
-        setkv(headers, "Cookie", string(getkv(headers, "Cookie", ""), cookiestosend))
+        setkv(headers, "Cookie", stringify(getkv(headers, "Cookie", ""), cookiestosend))
     end
 
     res = request(Next, method, url, headers, body; kw...)

diff --git a/src/cookies.jl b/src/cookies.jl
@@ -30,7 +30,7 @@
 
 module Cookies
 
-export Cookie, cookies
+export Cookie, cookies, stringify
 
 import Base: ==
 using ..Dates
@@ -119,7 +119,7 @@ function Base.String(c::Cookie, isrequest::Bool=true)
     return String(take!(io))
 end
 
-function Base.string(cookiestring::String, cookies::Vector{Cookie}, isrequest::Bool=true)
+function stringify(cookiestring::String, cookies::Vector{Cookie}, isrequest::Bool=true)
     io = IOBuffer()
     !isempty(cookiestring) && write(io, cookiestring, cookiestring[end] == ';' ? "" : ";")
     len = length(cookies)

diff --git a/test/cookies.jl b/test/cookies.jl
@@ -46,7 +46,7 @@
                    HTTP.Cookie("cookie-2", "v\$2"),
                    HTTP.Cookie("cookie-3", "v\$3"),
                   ]
-        @test string("", cookies) == "cookie-1=v\$1; cookie-2=v\$2; cookie-3=v\$3"
+        @test HTTP.stringify("", cookies) == "cookie-1=v\$1; cookie-2=v\$2; cookie-3=v\$3"
     end
 
     @testset "readsetcookies" begin