https://github.com/JuliaLang/julia/pull/25479

samoconnor · Jan 13, 2018 · 6c10abc · 6c10abc
1 parent 4d6f94d
commit 6c10abc
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 20 deletions.
diff --git a/src/AWS4AuthRequest.jl b/src/AWS4AuthRequest.jl
@@ -2,7 +2,6 @@ module AWS4AuthRequest
 
 using ..Base64
 using ..Dates
-using ..Unicode
 using MbedTLS: digest, MD_SHA256, MD_MD5
 import ..Layer, ..request, ..Headers
 using ..URIs

diff --git a/src/ConnectionPool.jl b/src/ConnectionPool.jl
@@ -546,12 +546,12 @@ function Base.show(io::IO, c::Connection)
         lpad(c.readcount,3), "↓", c.readbusy ? "🔒   " : "    ",
         c.host, ":",
         c.port != "" ? c.port : Int(c.peerport), ":", Int(c.localport),
-        ", ≣", c.pipeline_limit,
-        length(c.excess) > 0 ? ", $(length(c.excess))-byte excess" : "",
+        " ≣", c.pipeline_limit,
+        length(c.excess) > 0 ? " $(length(c.excess))-byte excess" : "",
         inactiveseconds(c) > 5 ?
-            ", inactive $(round(inactiveseconds(c),1))s" : "",
-        nwaiting > 0 ? ", $nwaiting bytes waiting" : "",
-        DEBUG_LEVEL > 1 ? ", $(Base._fd(tcpsocket(c.io)))" : "")
+            " inactive $(round(inactiveseconds(c),1))s" : "",
+        nwaiting > 0 ? " $nwaiting bytes waiting" : "",
+        DEBUG_LEVEL > 1 ? " $(Base._fd(tcpsocket(c.io)))" : "")
 end
 
 Base.show(io::IO, t::Transaction) = print(io, "T$(rpad(t.sequence,2)) ", t.c)
@@ -580,4 +580,18 @@ function showpool(io::IO)
     unlock(poollock)
 end
 
+function showpoolhtml(io::IO)
+    lock(poollock)
+    println(io, "<table>")
+    for c in pool
+        print(io, "<tr>")
+        for x in split("$c")
+            print(io, "<td>$x</td>")
+        end
+        println(io, "<tr>")
+    end
+    println(io, "</table>")
+    unlock(poollock)
+end
+
 end # module ConnectionPool
diff --git a/src/Messages.jl b/src/Messages.jl
@@ -67,8 +67,6 @@ export Message, Request, Response,
        readstartline!, writestartline,
        bodylength, unknown_length
 
-using ..Unicode
-
 import ..HTTP
 
 using ..Pairs

diff --git a/src/URIs.jl b/src/URIs.jl
@@ -1,7 +1,5 @@
 module URIs
 
-using ..Unicode
-
 import Base.==
 
 include("urlparser.jl")

diff --git a/src/WebSockets.jl b/src/WebSockets.jl
@@ -1,7 +1,6 @@
 module WebSockets
 
 using ..Base64
-using ..Unicode
 using MbedTLS: digest, MD_SHA1, SSLContext
 import ..HTTP
 using ..IOExtras

diff --git a/src/client.jl b/src/client.jl
@@ -25,10 +25,10 @@ mutable struct Client
     # cookies are stored in-memory per host and automatically sent when appropriate
     cookies::Dict{String, Set{Cookie}}
     # global request settings
-    options::(VERSION > v"0.7.0-DEV.2338" ? NamedTuple : Vector{Tuple{Symbol,Any}})
+    options::Vector{Tuple{Symbol,Any}}
 end
 
-Client(;options...) = Client(Dict{String, Set{Cookie}}(), options)
+Client(;options...) = Client(Dict{String, Set{Cookie}}(), collect(options))
 global const DEFAULT_CLIENT = Client()
 
 # build Request

diff --git a/src/compat.jl b/src/compat.jl
@@ -1,13 +1,11 @@
 @static if VERSION >= v"0.7.0-DEV.2915"
 
     using Base64
-    using Unicode
     import Dates
 
 else # Julia v0.6
 
     eval(:(module Base64 end))
-    eval(:(module Unicode end))
     const Dates = Base.Dates
 
     pairs(x) = [k => v for (k,v) in x]

diff --git a/src/cookies.jl b/src/cookies.jl
@@ -33,7 +33,6 @@ module Cookies
 export Cookie
 
 import ..Dates
-using ..Unicode
 
 import Base.==
 import ..URIs.isurlchar

diff --git a/test/async.jl b/test/async.jl
@@ -17,18 +17,21 @@ stop_pool_dump = false
         <html><head>
             <title>HTTP.jl Connection Pool</title>
             <meta http-equiv="refresh" content="1">
+            <style type="text/css" media="screen">
+                td { padding-left: 5px; padding-right: 5px }
+            </style>
         </head>
         <body><pre>
     """)
     write(http, "<body><pre>")
     buf = IOBuffer()
-    HTTP.ConnectionPool.showpool(buf)
+    HTTP.ConnectionPool.showpoolhtml(buf)
     write(http, take!(buf))
     write(http, "</pre></body>")
 end
 
 @async begin
-    sleep(1)
+    sleep(5)
     try
         run(`open http://localhost:8081`)
     catch e

diff --git a/test/messages.jl b/test/messages.jl
@@ -1,7 +1,6 @@
 module MessagesTest
 
 using ..Test
-using ..Unicode
 
 using HTTP.Messages
 import HTTP.Messages.appendheader

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,6 +1,5 @@
 using HTTP
 using HTTP.Dates
-using HTTP.Unicode
 using HTTP.Test
 
 @testset "HTTP" begin